Merge pull request #351 from roocs/prepare-v0140

Prepare v0.14.0, update dependencies
roocs · Oct 3, 2024 · 5834d0c · 5834d0c
2 parents e366efd + a974081
commit 5834d0c
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 91 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -20,7 +20,7 @@ build:
     python: "mambaforge-22.9"
 
 conda:
-  environment: docs/environment.yml
+  environment: environment.yml
 
 # Optionally set the version of Python and requirements required to build your docs
 python:

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -76,7 +76,7 @@ Ready to contribute? Here's how to set up `clisops` for local development.
         $ mkvirtualenv clisops
 
         # For Anaconda/Miniconda environments:
-        $ conda create -n clisops python=(3.8, 3.9, 3.10, etc.)
+        $ conda create -n clisops python=(3.9, 3.10, 3.11, etc.)
 
         $ cd clisops/
         $ pip install -e .

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -8,12 +8,14 @@ New Features
 ^^^^^^^^^^^^
 * `clisops` now makes use of `pytest-xdist` for parallel testing. This can be enabled using `--numprocesses={int}`. See the `pytest-xdist documentation <https://pytest-xdist.readthedocs.io/en/latest/>`_ for more information (#345).
 * Testing data caching is now handled by `pooch` and testing data registries ('stratus' for `roocs/mini-esgf-data` and 'nimbus' for `Ouranosinc/xclim-testdata`) (#345).
-* `clisops` coding conventions now use Python3.9+ conventions (#345).
+* `clisops` coding conventions now use Python 3.9+ conventions (#345).
 
 Breaking Changes
 ^^^^^^^^^^^^^^^^
 * `clisops` has dropped support for Python 3.8 (#345).
-* `clisops` now requires `filelock >=3.15.4`, `jinja2 >=2.11`, `numpy >=1.17`, and `scipy >=1.6` (#345).
+* Several dependencies have been updated to include lower bounds for clearer compatibility and easier maintenance (#345, #XYZ).
+    * The affected core dependencies are: `dask >=2023.6.0`, `filelock >=3.15.4`, `geopandas >=0.14.0`, `jinja2 >=2.11`, `numpy >=1.23.0`, `packaging >=23.2`, `pandas >=1.5.0`, `pooch >=1.8.0`, `scipy >=1.9.0`, and `xarray >=2022.6.0`.
+    * Extra dependencies are `ipython >=8.5.0`, `matplotlib >=3.6.0`, `nbconvert >=7.14.0`, `nbsphinx >=0.9.5`, `pre-commit >=3.5.0`, and `sphinx >=7.0.0`.
 * `clisops` no longer requires `gitpython >=3.1.30` and `requests >=2.0` (#345).
 * The development dependencies have been updated to include `deptry >=0.20.0` and `pytest-xdist[psutil] >=3.2` (#345).
 * `netCDF4` has been moved from core dependency to development dependency (#345).

diff --git a/clisops/__version__.py b/clisops/__version__.py
@@ -6,4 +6,4 @@
 __copyright__ = "Copyright 2018 United Kingdom Research and Innovation"
 __email__ = "[email protected]"
 __license__ = "BSD"
-__version__ = "0.13.1"
+__version__ = "0.14.0"
diff --git a/docs/conf.py b/docs/conf.py
@@ -82,7 +82,7 @@
 # the built documents.
 #
 # The short X.Y version.
-version = "0.13.1"
+version = "0.14.0"
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/environment.yml b/docs/environment.yml
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -56,9 +56,7 @@ Install clisops in development mode:
 
 .. code-block:: console
 
-  $ pip install -r requirements.txt
-  $ pip install -r requirements_dev.txt
-  $ python setup.py develop
+  $ pip install --editable ".[dev]"
 
 Run tests:
 

diff --git a/docs/usage.rst b/docs/usage.rst
@@ -2,9 +2,10 @@
 Usage
 =====
 
-To use clisops in a project::
+To use clisops in a project:
 
-    import clisops
+    .. code-block:: python
 
+        import clisops
 
 For information on the configuration options available in clisops, see: https://roocs-utils.readthedocs.io/en/latest/configuration.html#clisops
diff --git a/environment.yml b/environment.yml
@@ -8,34 +8,35 @@ dependencies:
  - cartopy >=0.23.0
  - cf_xarray >=0.8.6
  - cftime >=1.4.1
- - dask >=2.6.0
+ - dask >=2023.6.0
  - deptry >=0.20.0
  - filelock >=3.15.4
  - gdal >=3.0
- - geopandas >=0.11
+ - geopandas >=0.14.0
  - jinja2 >=2.11
  - loguru >=0.5.3
- - numpy >=1.17,<2.1
- - packaging
- - pandas >=1.0.3
+ - numpy >=1.23.0,<2.1
+ - packaging >=23.2
+ - pandas >=1.5.3
  - platformdirs >=4.0
- - pooch
+ - pooch >=1.8.0
  - pyproj >=3.3.0
  - roocs-grids >=0.1.2
  - roocs-utils >=0.6.7,<0.7
- - scipy >=1.6
+ - scipy >=1.9.0
  - shapely >=1.9
- - xarray >=0.21,<2023.3.0 # See: https://github.com/pydata/xarray/issues/7794
+ - xarray >=2022.6.0,<2023.3.0 # See: https://github.com/pydata/xarray/issues/7794
+  # Extras
+ - netcdf4 >=1.4
  - xesmf >=0.8.2
   # Dev tools and testing
  - black >=24.8.0
  - bump-my-version >=0.18.3
  - coverage >=7.5.0
  - flake8 >=7.0.0
- - ipython
  - isort >=5.13.2
  - netCDF4 >=1.4
- - pre-commit >=3.0.0
+ - pre-commit >=3.5.0
  - pytest >=8.0.0
  - pytest-cov >=5.0.0
  - pytest-loguru >=0.3.0
@@ -44,11 +45,13 @@ dependencies:
  - watchdog >=4.0.0
  # Documentation
  - ipykernel
- - ipython
+ - ipython >=8.5.0
  - ipython_genutils
  - jupyter_client
- - matplotlib >=3.5.2
- - nbsphinx
+ - matplotlib-base >=3.6.0
+ - nbconvert >=7.14.0
+ - nbsphinx >=0.9.5
  - pandoc
- - sphinx >=6.0.0
+ - psy-maps >=1.5.0
+ - sphinx >=7.0.0
  - sphinx-rtd-theme >=1.0
diff --git a/pyproject.toml b/pyproject.toml
@@ -50,23 +50,23 @@ dependencies = [
   # cf-xarray is differently named on conda-forge
   "cf-xarray >=0.8.6",
   "cftime >=1.4.1",
-  "dask[complete] >=2.6",
+  "dask[complete] >=2023.6.0",
   "filelock >=3.15.4",
-  "geopandas >=0.11",
+  "geopandas >=0.14.0",
   "jinja2 >=2.11",
   "loguru >=0.5.3",
-  "numpy >=1.17,<2.1",
-  "packaging",
-  "pandas >=1.0.3",
+  "numpy >=1.23.0,<2.1",
+  "packaging >=23.2",
+  "pandas >=1.5.0",
   "platformdirs >=4.0",
-  "pooch",
+  "pooch >=1.8.0",
   "pyproj >=3.3.0",
   # roocs_grids is differently named on conda-forge
   "roocs_grids >=0.1.2",
   "roocs-utils >=0.6.7,<0.7",
-  "scipy>=1.6",
+  "scipy>=1.9.0",
   "shapely >=1.9",
-  "xarray >=0.21"
+  "xarray >=2022.6.0"
 ]
 
 [project.optional-dependencies]
@@ -79,7 +79,7 @@ dev = [
   "flake8 >=7.0.0",
   "isort >=5.13.2",
   "netCDF4 >=1.4",
-  "pre-commit >=3.0.0",
+  "pre-commit >=3.5.0",
   "pytest >=8.0.0",
   "pytest-cov >=5.0.0",
   "pytest-loguru >=0.3.0",
@@ -89,19 +89,20 @@ dev = [
 ]
 docs = [
   "ipykernel",
-  "ipython",
+  "ipython >=8.5.0",
   "ipython_genutils",
   "jupyter_client",
-  "matplotlib >=3.5.2",
-  "nbconvert",
-  "nbsphinx",
-  "sphinx >=6.0.0",
+  "matplotlib >=3.6.0",
+  "nbconvert >=7.14.0",
+  "nbsphinx >=0.9.5",
+  "psy-maps >=1.5.0",
+  "sphinx >=7.0.0",
   "sphinx-rtd-theme >=1.0"
 ]
 extras = [
   "xesmf >=0.8.2",
   # See: https://github.com/pydata/xarray/issues/7794
-  "xarray >=0.21.0,<2023.03.0"
+  "xarray >=2022.6.0,<2023.3.0"
 ]
 
 [project.urls]
@@ -122,9 +123,9 @@ target-version = [
 ]
 
 [tool.bumpversion]
-current_version = "0.13.1"
+current_version = "0.14.0"
 commit = true
-tag = true
+tag = false
 allow_dirty = false
 
 [[tool.bumpversion.files]]