diff --git a/.cruft.json b/.cruft.json index 1d946003..284539c6 100644 --- a/.cruft.json +++ b/.cruft.json @@ -11,7 +11,7 @@ "project_slug": "xscen", "project_short_description": "A climate change scenario-building analysis framework, built with xclim/xarray.", "pypi_username": "RondeauG", - "version": "0.7.2-beta", + "version": "0.7.3-beta", "use_pytest": "y", "use_black": "y", "add_pyup_badge": "n", diff --git a/.github/labeler.yml b/.github/labeler.yml index 3912e703..8815f1ae 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -6,7 +6,13 @@ # not configurations related to the deployment process itself. CI: - - .* # all '.' files + - .cruft.json + - .editorconfig + - .gitignore + - .pre-commit-config.yaml + - .readthedocs.yml + - .secrets.baseline + - .yamllint.yaml - .github/workflows/* - docs/Makefile - tox.ini @@ -15,7 +21,6 @@ CI: docs: - .readthedocs.yml - docs/**/* - - AUTHORS.rst - CONTRIBUTING.rst - ISSUE_TEMPLATE/**/* - ISSUE_TEMPLATE.md diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c72afae0..d82123ad 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,6 +19,7 @@ repos: - id: check-json - id: pretty-format-json args: [ '--autofix', '--no-ensure-ascii', '--no-sort-keys' ] + exclude: .ipynb - id: check-yaml args: [ '--allow-multiple-documents' ] exclude: conda/xscen/meta.yaml diff --git a/HISTORY.rst b/HISTORY.rst index f5537145..0bca3320 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,31 @@ History ======= +v0.8.0 (unreleased) +------------------- +Contributors to this version: Gabriel Rondeau-Genesse (:user:`RondeauG`). + +Announcements +^^^^^^^^^^^^^ +* N/A + +New features and enhancements +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +* N/A + +Breaking changes +^^^^^^^^^^^^^^^^ +* N/A + +Bug fixes +^^^^^^^^^ +* N/A + +Internal changes +^^^^^^^^^^^^^^^^ +* Fixed pre-commit's pretty-format-json so it ignores notebooks. (:pull:`254`). +* Fixed the labeler so docs/CI isn't automatically added for contributions by new collaborators. (:pull:`254`). + v0.7.1 (2023-08-23) ------------------- * Update dependencies by removing ``pygeos``, pinning ``shapely>=2`` and ``intake-esm>=2023.07.07`` as well as other small fixes to the environment files. (:pull:`243`). diff --git a/docs/notebooks/2_getting_started.ipynb b/docs/notebooks/2_getting_started.ipynb index 0b69aa7c..eb29c506 100644 --- a/docs/notebooks/2_getting_started.ipynb +++ b/docs/notebooks/2_getting_started.ipynb @@ -927,7 +927,7 @@ "\n", "`xs.compute_indicators` makes use of *xclim*'s indicator modules functionalities to compute a given list of indicators. It is called by either using:\n", "\n", - "- The path to a [YAML file](https://xclim.readthedocs.io/en/stable/xclim.core.html?highlight=yaml#yaml-file-structure) structured in a way compatible with *xclim*'s `build_indicator_module_from_yaml`\n", + "- The path to a [YAML file](https://xclim.readthedocs.io/en/stable/api.html#yaml-file-structure) structured in a way compatible with *xclim*'s `build_indicator_module_from_yaml`\n", "- An indicator module directly\n", "- A sequence of indicators\n", "- A sequence of tuples as returned by calling `iter_indicators()` on an indicator module.\n", diff --git a/setup.cfg b/setup.cfg index d2a9e950..32b36541 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.7.2-beta +current_version = 0.7.3-beta commit = True tag = False parse = (?P\d+)\.(?P\d+).(?P\d+)(\-(?P[a-z]+))? diff --git a/setup.py b/setup.py index 1860b687..b8a4cbb7 100644 --- a/setup.py +++ b/setup.py @@ -80,6 +80,6 @@ test_suite="tests", extras_require={"dev": dev_requirements}, url="https://github.com/Ouranosinc/xscen", - version="0.7.2-beta", + version="0.7.3-beta", zip_safe=False, ) diff --git a/tests/test_diagnostics.py b/tests/test_diagnostics.py index e605e767..401c44e6 100644 --- a/tests/test_diagnostics.py +++ b/tests/test_diagnostics.py @@ -126,7 +126,7 @@ def test_variables(self): xs.diagnostics.health_checks(ds, variables_and_units={"tas": "degC"}) with pytest.warns( UserWarning, - match="Data units kelvin are not compatible with requested 1 millimeter.", + match="Data units kelvin are not compatible with requested mm.", ): xs.diagnostics.health_checks(ds, variables_and_units={"tas": "mm"}) diff --git a/tests/test_xscen.py b/tests/test_xscen.py index 47bbd39f..3a78c2a3 100644 --- a/tests/test_xscen.py +++ b/tests/test_xscen.py @@ -28,4 +28,4 @@ def test_package_metadata(self): contents = f.read() assert """Gabriel Rondeau-Genesse""" in contents assert '__email__ = "rondeau-genesse.gabriel@ouranos.ca"' in contents - assert '__version__ = "0.7.2-beta"' in contents + assert '__version__ = "0.7.3-beta"' in contents diff --git a/xscen/__init__.py b/xscen/__init__.py index dcfdcd3b..04817766 100644 --- a/xscen/__init__.py +++ b/xscen/__init__.py @@ -52,7 +52,7 @@ __author__ = """Gabriel Rondeau-Genesse""" __email__ = "rondeau-genesse.gabriel@ouranos.ca" -__version__ = "0.7.2-beta" +__version__ = "0.7.3-beta" # monkeypatch so that warnings.warn() doesn't mention itself