Skip to content

Commit

Permalink
Merge branch 'main' into numpydoc
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeitsperre authored Nov 22, 2024
2 parents 624b6fb + 88650ba commit d292092
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changelog

v0.54.0 (unreleased)
--------------------
Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), Pascal Bourgault (:user:`aulemahal`).
Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), Pascal Bourgault (:user:`aulemahal`), Éric Dupuis (:user:`coxipi`).

Breaking changes
^^^^^^^^^^^^^^^^
Expand All @@ -20,6 +20,7 @@ Bug fixes
Internal changes
^^^^^^^^^^^^^^^^
* Changed french translations with word "pluvieux" to "avec précipitations". (:issue:`1960`, :pull:`1994`).
* `streamflow` entry replaced with `q` in ``variables.yml``. (:issue:`1912`, :pull:`1996`)
* In order to address 403 (forbidden) request errors when retrieving data from GitHub via ReadTheDocs, the ``nimbus`` class has been modified to use an overloaded `fetch` method that appends a User-Agent header to the request. (:pull:`2001`).
* Addressed a very rare race condition that can happen if `pytest` is tearing down the test environment when running across multiple workers. (:pull:`1863`).

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ target-version = [
]

[tool.bumpversion]
current_version = "0.53.3-dev.5"
current_version = "0.53.3-dev.6"
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.3-dev.5"
__version__ = "0.53.3-dev.6"


with _resources.as_file(_resources.files("xclim.data")) as _module_data:
Expand Down
2 changes: 1 addition & 1 deletion xclim/data/variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ variables:
standard_name: lwe_thickness_of_snow_amount
data_flags:
- negative_accumulation_values:
streamflow:
q:
canonical_units: m3 s-1
cell_methods: "time: mean"
description: The amount of water, in all phases, flowing in the river channel and flood plain.
Expand Down

0 comments on commit d292092

Please sign in to comment.