Skip to content

Commit

Permalink
Pin pytest below v8.0, use bump-my-version conda package (#1629)
Browse files Browse the repository at this point in the history
### What kind of change does this PR introduce?

* Pins `pytest` below v8.0 due to breakage with `xdoctest`
* Now using the `bump-my-version` Conda-forge package

### Does this PR introduce a breaking change?

No.

### Other information:

Erotemic/xdoctest#151
  • Loading branch information
Zeitsperre committed Jan 29, 2024
2 parents 0f0a85d + 2812db8 commit 65ebdcd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -57,7 +57,7 @@ dependencies:
- pre-commit
- pybtex
- pylint
- pytest
- 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
Expand All @@ -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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ dev = [
"pre-commit >=2.9",
"pybtex",
"pylint",
"pytest",
"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",
Expand Down

0 comments on commit 65ebdcd

Please sign in to comment.