pin pytest below v8.0, use bump-my-version conda package

Ouranosinc · Jan 29, 2024 · ea8b825 · ea8b825
1 parent 0f0a85d
commit ea8b825
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -78,7 +78,7 @@ dev = [
   "pre-commit >=2.9",
   "pybtex",
   "pylint",
-  "pytest",
+  "pytest <8.0",
   "pytest-cov",
   "pytest-socket",
   "pytest-xdist[psutil] >=3.2",