Merge branch 'master' into sdba-props-as-inds

Ouranosinc · Aug 30, 2022 · c8fe47a · c8fe47a
2 parents 457b6eb + b2090ff
commit c8fe47a
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 134 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -64,6 +64,7 @@ Internal changes
 * Added a `sphinx-build -b linkcheck` step to the `tox`-based `"docs"` build as well as to the ReadTheDocs configuration. (:pull:`1160`).
 * `pylint` is now setup to use a `pylintrc` file, allowing for more granular control of warnings and exceptions. Many errors are still present, so addressing them will need to occur gradually. (:pull:`1163`).
 * The generic indices `count_level_crossings`, `count_occurrences`, `first_occurrence`, and `last_occurrence` are now fully tested. (:pull:`1157`).
+* Adjusted the ANUCLIM indices by removing "ANUCLIM" from their titles, modifying their docstrings, and handling `"op"` input in a more user-friendly way. (:issue:`1055`, :pull:`1169`).
 
 0.37.0 (2022-06-20)
 -------------------

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.37.23-beta
+current_version = 0.37.24-beta
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+).(?P<patch>\d+)(\-(?P<release>[a-z]+))?

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 AUTHOR = "Travis Logan"
 AUTHOR_EMAIL = "[email protected]"
 REQUIRES_PYTHON = ">=3.8.0"
-VERSION = "0.37.23-beta"
+VERSION = "0.37.24-beta"
 LICENSE = "Apache Software License 2.0"
 
 with open("README.rst") as readme_file:

diff --git a/xclim/__init__.py b/xclim/__init__.py
@@ -11,7 +11,7 @@
 
 __author__ = """Travis Logan"""
 __email__ = "[email protected]"
-__version__ = "0.37.23-beta"
+__version__ = "0.37.24-beta"
 
 
 # Load official locales

diff --git a/xclim/data/anuclim.yml b/xclim/data/anuclim.yml
@@ -5,9 +5,9 @@ doc: |
 
   The ANUCLIM (v6.1) software package BIOCLIM sub-module produces a set of bioclimatic parameters derived values of
   temperature and precipitation. The methods in this module are wrappers around a subset of corresponding methods of
-  `xclim.indices`.
+  :py:mod:`xclim.indices`.
 
-  Furthermore, according to the ANUCLIM user-guide :cite:t:`xu_anuclim_2010`, input values should be at a weekly or
+  Furthermore, according to the ANUCLIM user-guide :cite:p:`xu_anuclim_2010`, input values should be at a weekly or
   monthly frequency.  However, the implementation here expands these definitions and can calculate the result with daily
   input data.
 realm: atmos