diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1a76759fe..8a901d972 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,7 +33,7 @@ repos: - id: yamllint args: [ '--config-file=.yamllint.yaml' ] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.1.0 + rev: 24.1.1 hooks: - id: black - repo: https://github.com/PyCQA/isort @@ -61,7 +61,7 @@ repos: - id: nbqa-pyupgrade args: [ '--py38-plus' ] - id: nbqa-black - additional_dependencies: [ 'black==24.1.0' ] + additional_dependencies: [ 'black==24.1.1' ] - id: nbqa-isort - repo: https://github.com/kynan/nbstripout rev: 0.6.1 @@ -73,7 +73,7 @@ repos: rev: v0.3.9 hooks: - id: blackdoc - additional_dependencies: [ 'black==24.1.0' ] + additional_dependencies: [ 'black==24.1.1' ] exclude: '(xclim/indices/__init__.py|docs/installation.rst)' - repo: https://github.com/gitleaks/gitleaks rev: v8.18.1 diff --git a/environment.yml b/environment.yml index 25490351a..0559849f8 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: https://github.com/Erotemic/xdoctest/issues/151 - 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 ac4eab39e..76a2b4a33 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,7 @@ dependencies = [ [project.optional-dependencies] dev = [ # Dev tools and testing - "black ==24.1.0", + "black ==24.1.1", "blackdoc ==0.3.9", "bump-my-version >=0.17.1", "codespell", @@ -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",