From b359e92db5fe63c9eabfb2b053a597c982f43337 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 29 Jan 2024 15:04:20 -0600
Subject: [PATCH 1/5] chore: pin pytest version

---
 noxfile.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 873b60ce91..4442478f7d 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -28,8 +28,10 @@
 import nox
 import nox.sessions
 
+
 BLACK_VERSION = "black==22.3.0"
 ISORT_VERSION = "isort==5.12.0"
+PYTEST_VERSION = "pytest==7.4.4"
 SPHINX_VERSION = "sphinx==4.5.0"
 LINT_PATHS = ["docs", "bigframes", "tests", "third_party", "noxfile.py", "setup.py"]
 
@@ -39,7 +41,7 @@
 UNIT_TEST_STANDARD_DEPENDENCIES = [
     "mock",
     "asyncmock",
-    "pytest",
+    PYTEST_VERSION,
     "pytest-cov",
     "pytest-asyncio",
     "pytest-mock",
@@ -55,7 +57,7 @@
     "jinja2",
     "mock",
     "openpyxl",
-    "pytest",
+    PYTEST_VERSION,
     "pytest-cov",
     "pytest-retry",
     "pytest-timeout",

From 1296281b172272d9d3b3d0f6b2170349b59107c4 Mon Sep 17 00:00:00 2001
From: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 21:07:05 +0000
Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?=
 =?UTF-8?q?st-processor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
---
 noxfile.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/noxfile.py b/noxfile.py
index 4442478f7d..0874ac741d 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -28,7 +28,6 @@
 import nox
 import nox.sessions
 
-
 BLACK_VERSION = "black==22.3.0"
 ISORT_VERSION = "isort==5.12.0"
 PYTEST_VERSION = "pytest==7.4.4"

From cd578725fa760bcc24bc354d9401092ec5ddecaa Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 29 Jan 2024 15:10:21 -0600
Subject: [PATCH 3/5] set max instead of exact

---
 noxfile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/noxfile.py b/noxfile.py
index 0874ac741d..d096dde155 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -30,7 +30,7 @@
 
 BLACK_VERSION = "black==22.3.0"
 ISORT_VERSION = "isort==5.12.0"
-PYTEST_VERSION = "pytest==7.4.4"
+PYTEST_VERSION = "pytest<=7.4.4"
 SPHINX_VERSION = "sphinx==4.5.0"
 LINT_PATHS = ["docs", "bigframes", "tests", "third_party", "noxfile.py", "setup.py"]
 

From 457334e518bc5bbff937e1b4e8c3e437d517b227 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 29 Jan 2024 15:31:54 -0600
Subject: [PATCH 4/5] comment why we set max version

---
 noxfile.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/noxfile.py b/noxfile.py
index d096dde155..63a7f24c57 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -30,7 +30,9 @@
 
 BLACK_VERSION = "black==22.3.0"
 ISORT_VERSION = "isort==5.12.0"
-PYTEST_VERSION = "pytest<=7.4.4"
+
+# pytest-retry is not yet compatible with python 8.x.
+PYTEST_VERSION = "pytest<8.0.0dev"
 SPHINX_VERSION = "sphinx==4.5.0"
 LINT_PATHS = ["docs", "bigframes", "tests", "third_party", "noxfile.py", "setup.py"]
 

From 8731be2f70c23541ae14622be9df9cea206235af Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 29 Jan 2024 15:42:28 -0600
Subject: [PATCH 5/5] link to upstream issue

---
 noxfile.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/noxfile.py b/noxfile.py
index 63a7f24c57..b79f6f1182 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -31,7 +31,8 @@
 BLACK_VERSION = "black==22.3.0"
 ISORT_VERSION = "isort==5.12.0"
 
-# pytest-retry is not yet compatible with python 8.x.
+# pytest-retry is not yet compatible with pytest 8.x.
+# https://github.com/str0zzapreti/pytest-retry/issues/32
 PYTEST_VERSION = "pytest<8.0.0dev"
 SPHINX_VERSION = "sphinx==4.5.0"
 LINT_PATHS = ["docs", "bigframes", "tests", "third_party", "noxfile.py", "setup.py"]