install raven-hydro from upstream branch

.github/workflows/main.yml

@@ -45,15 +45,19 @@ jobs:
           - tox-env: py39-linux
             python-version: "3.9"
             os: ubuntu-latest
-          - tox-env: py310-linux
+          - tox-env: py310-linux-upstream
             python-version: "3.10"
             os: ubuntu-latest
+            upstream-branch: "from-official-git"
           - tox-env: py311-linux
             python-version: "3.11"
             os: ubuntu-latest
           - tox-env: py311-macos
             python-version: "3.11"
             os: macos-latest
+          - tox-env: py312-linux
+            python-version: "3.12"
+            os: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -92,6 +96,7 @@ jobs:
         COVERALLS_FLAG_NAME: run-${{ matrix.tox-env }}
         COVERALLS_PARALLEL: true
         COVERALLS_SERVICE_NAME: github
+        UPSTREAM_BRANCH: ${{ matrix.upstream-branch }}
 
   conda:
     name: Python${{ matrix.python-version }} (${{ matrix.os }}) (Conda)

environment.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python >=3.8,<3.12
+  - python >=3.8,<3.13
   - raven-hydro ==0.2.4
   - libgcc  # for mixing raven-hydro from PyPI with conda environments
   - affine

pyproject.toml

@@ -23,12 +23,13 @@ classifiers = [
   "License :: OSI Approved :: MIT License",
   "Natural Language :: English",
   "Operating System :: OS Independent",
-  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3 :: Only",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
   "Topic :: Scientific/Engineering :: Atmospheric Science",
   "Topic :: Scientific/Engineering :: GIS",
   "Topic :: Scientific/Engineering :: Hydrology"

tox.ini

@@ -2,11 +2,11 @@
 min_version = 4.0
 envlist =
     black
-    py{38,39,310,311}-{linux,macos}
+    py{38,39,310,311,312}-{linux,macos}
     docs
 requires =
-    pip >=21.0
-    setuptools >=63.0
+    flit
+    pip >=23.0
 opts =
     -vv
 
@@ -44,6 +44,7 @@ passenv =
     LD_LIBRARY_PATH
     LD_PRELOAD
     RAVENPY_*
+    UPSTREAM_BRANCH
 extras =
     dev
     gis
@@ -54,6 +55,10 @@ deps =
     # numpy must be present in python env before GDAL is installed
     numpy
     gdal == {env:GDAL_VERSION}
+    upstream: raven-hydro @ git+https://github.com/Ouranosinc/raven-hydro.git@{env:UPSTREAM_BRANCH}
+commands_pre =
+    python -m pip list
+    - python -m pip check
 commands =
     # Regenerate NetCDF4-Python wheel from source files
     # Rebuild netcdf4 on Linux due to errors in new version (https://github.com/Unidata/netcdf4-python/issues/1192)