Skip to content

Commit

Permalink
Fix stable documentation build (#1970)
Browse files Browse the repository at this point in the history
### What kind of change does this PR introduce?

* Adds a few missing dependencies to the `environment.yml
* Synchronizes a few dependencies between `pyproject.toml` and
`environment.yml`
* Updates the pre-commit hook versions

### Does this PR introduce a breaking change?

No.

### Other information:

This should be followed with a patch fix release, as the stable
documentation is not rendering at the moment.
  • Loading branch information
Zeitsperre authored Oct 21, 2024
2 parents 2748c58 + b2821c6 commit df86b39
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 22 deletions.
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default_language_version:

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.17.0
rev: v3.18.0
hooks:
- id: pyupgrade
args: ['--py39-plus']
Expand Down Expand Up @@ -37,7 +37,7 @@ repos:
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.9
rev: v0.7.0
hooks:
- id: ruff
args: [ '--fix', '--show-fixes' ]
Expand All @@ -61,9 +61,9 @@ repos:
hooks:
- id: nbqa-pyupgrade
args: [ '--py39-plus' ]
additional_dependencies: [ 'pyupgrade==3.16.0' ]
additional_dependencies: [ 'pyupgrade==3.18.0' ]
- id: nbqa-black
additional_dependencies: [ 'black==24.4.2' ]
additional_dependencies: [ 'black==24.10.0' ]
- repo: https://github.com/kynan/nbstripout
rev: 0.7.1
hooks:
Expand All @@ -82,7 +82,7 @@ repos:
- id: rst-inline-touching-normal
- id: text-unicode-replacement-char
- repo: https://github.com/executablebooks/mdformat
rev: 0.7.17
rev: 0.7.18
hooks:
- id: mdformat
exclude: '.github/\w+.md|.github/publish-mastodon-template.md|docs/paper/paper.md'
Expand All @@ -99,11 +99,11 @@ repos:
- id: codespell
additional_dependencies: [ 'tomli' ]
- repo: https://github.com/gitleaks/gitleaks
rev: v8.20.1
rev: v8.21.1
hooks:
- id: gitleaks
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.3
rev: 0.29.4
hooks:
- id: check-github-workflows
- id: check-readthedocs
Expand Down
1 change: 1 addition & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ python:
path: .
extra_requirements:
- dev
- extras

search:
ranking:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
Changelog
=========

v0.53.1 (2024-10-21)
--------------------
Contributors to this version: Trevor James Smith (:user:`Zeitsperre`).

Internal changes
^^^^^^^^^^^^^^^^
* Fixed a few missing dependencies in the documentation build recipe that were causing errors in the CI workflow on ReadTheDocs. (:pull:`1970`).

v0.53.0 (2024-10-17)
--------------------
Contributors to this version: Adrien Lamarche (:user:`LamAdr`), Trevor James Smith (:user:`Zeitsperre`), Éric Dupuis (:user:`coxipi`), Pascal Bourgault (:user:`aulemahal`), Sascha Hofmann (:user:`saschahofmann`), David Huard (:user:`huard`).
Expand Down
21 changes: 11 additions & 10 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- click >=8.1
- dask >=2.6.0
- filelock >=3.14.0
- flox >= 0.9
- jsonpickle >=3.1.0
- numba >=0.54.1
- numpy >=1.23.0
Expand All @@ -26,17 +25,19 @@ dependencies:
- xarray >=2023.11.0
- yamale >=5.0.0
# Extras
- flox
- lmoments3 # Required for some Jupyter notebooks
- fastnanquantile >=0.0.2
- flox >=0.9
- lmoments3 >=1.0.7 # Required for some Jupyter notebooks
- pot >=0.9.4
# Testing and development dependencies
- black ==24.8.0
- black ==24.10.0
- blackdoc ==0.3.9
- bump-my-version >=0.25.4
- bump-my-version >=0.27.0
- cairosvg
- codespell ==2.3.0
- coverage >=7.5.0
- coveralls >=4.0.1 # Note: coveralls is not yet compatible with Python 3.13
- deptry ==0.18.0
- deptry ==0.20.0
- distributed >=2.0
- flake8 >=7.1.1
- flake8-rst-docstrings >=0.3.0
Expand All @@ -59,7 +60,7 @@ dependencies:
- pooch >=1.8.0
- pre-commit >=3.7
- pybtex >=0.24.0
- pylint >=3.1
- pylint >=3.3.1
- pytest >=8.0.0
- pytest-cov >=5.0.0
- pytest-socket >=0.6.0
Expand All @@ -73,9 +74,9 @@ dependencies:
- sphinx-mdinclude
- sphinxcontrib-bibtex
- tokenize-rt >=5.2.0
- tox >=4.18.1
# - tox-conda # Will be added when a [email protected]+ compatible plugin is released.
- vulture ==2.11
- tox >=4.21.2
- tox-gh >=1.4.4
- vulture ==2.13
- xdoctest >=1.1.5
- yamllint >=1.35.1
- pip >=24.2.0
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ dev = [
"pip >=24.2.0",
"pooch >=1.8.0",
"pre-commit >=3.7",
"pylint >=3.2.4",
"pylint >=3.3.1",
"pytest >=8.0.0",
"pytest-cov >=5.0.0",
"pytest-socket >=0.6.0",
"pytest-xdist[psutil] >=3.2",
"ruff >=0.5.6",
"tokenize-rt >=5.2.0",
"tox >=4.18.1",
# "tox-conda", # Will be added when a [email protected]+ compatible plugin is released.
"tox >=4.21.2",
"tox-gh >=1.4.4",
"vulture ==2.13",
"xdoctest >=1.1.5",
"yamllint ==1.35.1"
Expand Down Expand Up @@ -135,7 +135,7 @@ target-version = [
]

[tool.bumpversion]
current_version = "0.53.0"
current_version = "0.53.1"
commit = true
commit_args = "--no-verify"
tag = false
Expand Down
2 changes: 1 addition & 1 deletion xclim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

__author__ = """Travis Logan"""
__email__ = "[email protected]"
__version__ = "0.53.0"
__version__ = "0.53.1"


with _resources.as_file(_resources.files("xclim.data")) as _module_data:
Expand Down

0 comments on commit df86b39

Please sign in to comment.