Merge branch 'main' into fix-template

Ouranosinc · May 15, 2024 · b142557 · b142557
2 parents 91de483 + a0ac4b7
commit b142557
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,14 +4,17 @@ Changelog
 
 v0.9.1 (unreleased)
 -------------------
-Contributors to this version: Pascal Bourgault (:user:`aulemahal`), Juliette Lavoie (:user:`juliettelavoie`).
+Contributors to this version: Pascal Bourgault (:user:`aulemahal`), Trevor James Smith (:user:`Zeitsperre`), Juliette Lavoie (:user:`juliettelavoie`).
 
 Bug fixes
 ^^^^^^^^^
 * Fixed defaults for ``xr_combine_kwargs`` in ``extract_dataset`` (:pull:`402`).
 * Fixed bug with `xs.utils.update_attr`(:issue:`404`, :pull:`405`).
 * Fixed template 1 bugs due to changes in versions of dependencies. ( :pull:`405`).
 
+Internal changes
+^^^^^^^^^^^^^^^^
+* `cartopy` has been pinned above version '0.23.0' in order to address a licensing issue. (:pull:`403`).
 
 v0.9.0 (2024-05-07)
 -------------------

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -6,7 +6,7 @@ dependencies:
   # Don't forget to sync changes between environment.yml, environment-dev.yml, and setup.py!
   # Also consider updating the list in xs.utils.show_versions if you add a new package.
   # Main packages
-  - cartopy
+  - cartopy >=0.23.0
   - cftime
   - cf_xarray >=0.7.6
   - clisops >=0.10

diff --git a/environment.yml b/environment.yml
@@ -6,7 +6,7 @@ dependencies:
   # Don't forget to sync changes between environment.yml, environment-dev.yml, and setup.py!
   # Also consider updating the list in xs.utils.show_versions if you add a new package.
   # Main packages
-  - cartopy
+  - cartopy >=0.23.0
   - cftime
   - cf_xarray >=0.7.6
   - clisops >=0.10

diff --git a/pyproject.toml b/pyproject.toml
@@ -36,7 +36,7 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
   "babel",
-  "cartopy",
+  "cartopy >=0.23.0",
   "cftime",
   "cf_xarray >=0.7.6",
   "clisops >=0.10",