Merge branch 'main' into upd-globaltas

.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.13-beta",
+      "version": "0.7.14-beta",
       "use_pytest": "y",
       "use_black": "y",
       "add_pyup_badge": "n",

.pre-commit-config.yaml

@@ -3,12 +3,12 @@ default_language_version:
 
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.14.0
+    rev: v3.15.0
     hooks:
     -   id: pyupgrade
         args: [ '--py39-plus' ]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         exclude: setup.cfg

.zenodo.json

@@ -39,6 +39,11 @@
       "name": "Braun, Marco",
       "affiliation": "Ouranos",
       "orcid": "0000-0001-5061-3217"
+    },
+    {
+      "name": "Bourdeau-Goulet, Sarah-Claude",
+      "affiliation": "Ouranos",
+      "orcid": "0000-0002-6125-2557"
     }
   ],
   "keywords": [

AUTHORS.rst

@@ -22,3 +22,4 @@ Contributors
 * Sarah Gammon <[email protected]> `@SarahG-579462 <https://github.com/SarahG-579462>`_
 * Yannick Rousseau
 * Marco Braun <[email protected]> `@vindelico <https://github.com/vindelico>`_
+* Sarah-Claude Bourdeau-Goulet <[email protected]> `@sarahclaude <https://github.com/sarahclaude>`_

HISTORY.rst

@@ -4,7 +4,7 @@ History
 
 v0.8.0 (unreleased)
 -------------------
-Contributors to this version: Gabriel Rondeau-Genesse (:user:`RondeauG`), Pascal Bourgault (:user:`aulemahal`), Juliette Lavoie (:user:`juliettelavoie`).
+Contributors to this version: Gabriel Rondeau-Genesse (:user:`RondeauG`), Pascal Bourgault (:user:`aulemahal`), Juliette Lavoie (:user:`juliettelavoie`), Sarah-Claude Bourdeau-Goulet (:user:`sarahclaude`).
 
 Announcements
 ^^^^^^^^^^^^^
@@ -23,6 +23,8 @@ New features and enhancements
 
 Breaking changes
 ^^^^^^^^^^^^^^^^
+* New argument ``attribute_weights`` to ``generate_weights`` to allow for custom weights. (:pull:`252`).
+* ``experiment_weights`` argument in ``generate_weights`` was renamed to ``balance_experiments``. (:pull:`252`).
 * For a sequence of models, the output of ``xs.get_warming_level`` is now a list. Revert to a dictionary with ``output='selected'`` (:pull:`270`).
 
 Bug fixes

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.13-beta
+current_version = 0.7.14-beta
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+).(?P<patch>\d+)(\-(?P<release>[a-z]+))?

setup.py

@@ -102,6 +102,6 @@ def run(self):
     test_suite="tests",
     extras_require={"dev": dev_requirements},
     url="https://github.com/Ouranosinc/xscen",
-    version="0.7.13-beta",
+    version="0.7.14-beta",
     zip_safe=False,
 )