Merge pull request #363 from CSHS-CWRA/pin-pyogrio

Pin pyogrio, update linting tools

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: pyupgrade
         args: [ '--py38-plus' ]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: trailing-whitespace
         exclude: setup.cfg
@@ -32,7 +32,7 @@ repos:
     hooks:
       - id: toml-sort-fix
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.4.0
+    rev: 24.4.2
     hooks:
       - id: black
         exclude: ^docs/
@@ -52,7 +52,7 @@ repos:
         args: [ '--py38-plus' ]
         additional_dependencies: [ 'pyupgrade==3.15.2' ]
       - id: nbqa-black
-        additional_dependencies: [ 'black==24.4.0' ]
+        additional_dependencies: [ 'black==24.4.2' ]
       - id: nbqa-isort
         additional_dependencies: [ 'isort==5.13.2' ]
   - repo: https://github.com/kynan/nbstripout
@@ -70,14 +70,14 @@ repos:
     rev: v0.3.9
     hooks:
       - id: blackdoc
-        additional_dependencies: [ 'black==24.4.0' ]
+        additional_dependencies: [ 'black==24.4.2' ]
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.35.1
     hooks:
       - id: yamllint
         args: [ '--config-file=.yamllint.yaml' ]
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.28.1
+    rev: 0.28.3
     hooks:
       - id: check-github-workflows
       - id: check-readthedocs
@@ -94,6 +94,6 @@ ci:
   autofix_prs: true
   autoupdate_branch: ''
   autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
-  autoupdate_schedule: quarterly
+  autoupdate_schedule: monthly
   skip: [ ]
   submodules: false

HISTORY.rst

@@ -15,6 +15,8 @@ Internal changes
 * Added some development dependencies that were missing to the `environment.yml`. (PR #358)
 * `test_climpred_hindcast_verif` is now skipped for Python3.10 builds. It seems to only fail on the particular version of Python. When examining the dependencies, other than the Python version (and ABI version), there are no differences in the environments between Python3.10 and Python3.11. My gut feeling points to an issue with `climpred`. (PR #358)
 * Temporarily disabled tests for macOS on GitHub due to architecture changes. (PR #358)
+* Pinned `pyogrio` below v0.8.0 until `geopandas` supports it.
+* Updated linting dependencies to the latest versions.
 
 0.14.0 (2024-03-13)
 -------------------

environment.yml

@@ -18,7 +18,7 @@ dependencies:
   - flake8 >=7.0.0
   - flit
   - gdal >=3.1
-  - geopandas >=0.13.0
+  - geopandas >=0.14.0
   - h5netcdf
   - haversine
   - holoviews
@@ -37,7 +37,7 @@ dependencies:
   - pydantic >=2.0
   - pydap
   - pymbolic
-  - pyogrio
+  - pyogrio <0.8.0  # pyogrio 0.8.0 is not yet compatible with geopandas
   - pyproj >=3.0
   - pytest
   - pytest-cov
@@ -52,7 +52,7 @@ dependencies:
   - tox >=4.5
   - typing_extensions
   - watchdog
-  - xarray >=2023.11.0  # xarray v2023.9.0 is incompatible with xclim<=0.45.0
+  - xarray >=2023.11.0
   - xclim >=0.48.2
   - xesmf
   - xskillscore

pyproject.toml

@@ -121,10 +121,10 @@ docs = [
 gis = [
   "affine",
   "fiona >=1.9",
-  "geopandas >=0.13.0",
+  "geopandas >=0.14.0",
   "gdal",
   "lxml",
-  "pyogrio",
+  "pyogrio <0.8.0", # pyogrio 0.8.0 is not compatible with geopandas
   "pyproj >=3.0.0",
   "rasterio",
   "rioxarray",

tox.ini

@@ -2,11 +2,11 @@
 min_version = 4.5
 envlist =
     black
-    py{38,39,310,311,312}-{linux,macos}
+    py{39,310,311,312}-{linux,macos}
     docs
 requires =
     flit
-    pip >=23.0
+    pip >=24.0
     setuptools >=68.0
     wheel >=0.42.0
 opts =
@@ -16,7 +16,7 @@ opts =
 skip_install = True
 deps =
     flake8 >=7.0.0
-    black >=24.2.0
+    black >=24.4.2
     isort >=5.13.2
 commands =
     make lint