Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Ouranosinc/xclim into fix-O…
Browse files Browse the repository at this point in the history
  • Loading branch information
saschahofmann committed Jan 16, 2025
2 parents 90d8345 + 4435256 commit 2ebd4b8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ New features and enhancements
Internal changes
^^^^^^^^^^^^^^^^
* `sphinx-codeautolink` and `pygments` have been temporarily pinned due to breaking API changes. (:pull:`2030`).
* Adjusted the ``TestOfficialYaml`` test to use a dynamic method for finding the installed location of `xclim`. (:pull:`2028`).

Bug fixes
^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion CI/requirements_ci.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bump-my-version==0.29.0
deptry==0.21.2
deptry==0.22.0
flit==3.10.1
pip==24.3.1
pylint==3.3.3
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ dev = [
"codespell ==2.3.0",
"coverage[toml] >=7.5.0",
"coveralls >=4.0.1", # coveralls is not yet compatible with Python 3.13
"deptry ==0.21.2",
"deptry ==0.22.0",
"flake8 >=7.1.1",
"flake8-rst-docstrings >=0.3.0",
"h5netcdf>=1.3.0",
Expand Down Expand Up @@ -140,7 +140,7 @@ target-version = [
]

[tool.bumpversion]
current_version = "0.54.1-dev.1"
current_version = "0.54.1-dev.2"
commit = true
commit_args = "--no-verify --signoff"
tag = false
Expand Down
2 changes: 1 addition & 1 deletion src/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.54.1-dev.1"
__version__ = "0.54.1-dev.2"


with _resources.as_file(_resources.files("xclim.data")) as _module_data:
Expand Down
3 changes: 2 additions & 1 deletion tests/test_modules.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

from importlib.util import find_spec
from inspect import _empty # noqa
from pathlib import Path

Expand Down Expand Up @@ -264,7 +265,7 @@ def test_validate(tmp_path):


class TestOfficialYaml(yamale.YamaleTestCase):
base_dir = str(Path(__file__).parent.parent / "src" / "xclim" / "data")
base_dir = str(Path(find_spec("xclim").origin).parent.joinpath("data"))
schema = "schema.yml"
yaml = ["cf.yml", "anuclim.yml", "icclim.yml"]

Expand Down

0 comments on commit 2ebd4b8

Please sign in to comment.