From ea8b825a2696cf250e74b1e87947639a7b376d6f Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:33:49 -0500
Subject: [PATCH 1/2] pin pytest below v8.0, use bump-my-version conda package

---
 environment.yml | 7 +++----
 pyproject.toml  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/environment.yml b/environment.yml
index 25490351a..5293ac923 100644
--- a/environment.yml
+++ b/environment.yml
@@ -29,9 +29,9 @@ dependencies:
   # Extras
   - flox
   # Testing and development dependencies
-  - black ==24.1.0
+  - black ==24.1.1
   - blackdoc ==0.3.9
-#  - bump-my-version  # The conda package is not as up-to-date as the PyPI package.
+  - bump-my-version >=0.17.1
   - cairosvg
   - codespell
   - coverage
@@ -57,7 +57,7 @@ dependencies:
   - pre-commit
   - pybtex
   - pylint
-  - pytest
+  - pytest <8.0  # pinned due to breakage with xdoctest. See:
   - pytest-cov
   - pytest-socket
   - pytest-xdist >=3.2
@@ -76,6 +76,5 @@ dependencies:
   - yamllint
   - pip
   - pip:
-    - bump-my-version >=0.17.1  # The conda package is not as up-to-date as the PyPI package.
     - flake8-alphabetize
     - sphinxcontrib-svg2pdfconverter
diff --git a/pyproject.toml b/pyproject.toml
index 5def3e35f..42bd3c8a6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,7 @@ dev = [
   "pre-commit >=2.9",
   "pybtex",
   "pylint",
-  "pytest",
+  "pytest <8.0",
   "pytest-cov",
   "pytest-socket",
   "pytest-xdist[psutil] >=3.2",

From 2812db8f897824c4d2882c179371b6425d2bb8e0 Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:55:32 -0500
Subject: [PATCH 2/2] Add pin message

---
 environment.yml | 2 +-
 pyproject.toml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 5293ac923..0559849f8 100644
--- a/environment.yml
+++ b/environment.yml
@@ -57,7 +57,7 @@ dependencies:
   - pre-commit
   - pybtex
   - pylint
-  - pytest <8.0  # pinned due to breakage with xdoctest. See:
+  - pytest <8.0  # Pinned due to breakage with xdoctest. See: https://github.com/Erotemic/xdoctest/issues/151
   - pytest-cov
   - pytest-socket
   - pytest-xdist >=3.2
diff --git a/pyproject.toml b/pyproject.toml
index 42bd3c8a6..76a2b4a33 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,7 @@ dev = [
   "pre-commit >=2.9",
   "pybtex",
   "pylint",
-  "pytest <8.0",
+  "pytest <8.0", # Pinned due to breakage with xdoctest. See: https://github.com/Erotemic/xdoctest/issues/151
   "pytest-cov",
   "pytest-socket",
   "pytest-xdist[psutil] >=3.2",