support tox-gh with Pythoin3.14, upstream raven-hydro config simplification

Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>

Author: Zeitsperre

.github/workflows/main.yml

@@ -56,7 +56,7 @@ jobs:
           python -m tox -e lint
 
   pip:
-    name: Test with Python${{ matrix.python-version }} (tox, ${{ matrix.os }}), upstream=${{ matrix.upstream-branch }})
+    name: Test with Python${{ matrix.python-version }} (tox, ${{ matrix.os }}), raven-hydro=${{ matrix.raven-hydro-upstream-branch }})
     needs: lint
     runs-on: ${{ matrix.os }}
     strategy:
@@ -67,6 +67,7 @@ jobs:
         include:
           - os: 'ubuntu-latest'
             python-version: '3.10'
+            raven-hydro-upstream-branch: "main"
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
@@ -126,7 +127,7 @@ jobs:
             python3 -m tox
         env:
           TOX_GH_MAJOR_MINOR: ${{ matrix.python-version }}
-          UPSTREAM_BRANCH: ${{ matrix.upstream-branch }}
+          RAVEN_HYDRO_UPSTREAM_BRANCH: ${{ matrix.raven-hydro-upstream-branch }}
 
       - name: Report Coverage
         uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7

tox.toml

@@ -38,22 +38,17 @@ commands = [
 commands_post = []
 allowlist_externals = ["make"]
 
-[env.upstream]
-description = "Run tests with pytest under {basepython} for upstream libraries"
-commands_pre = [
-  ["python", "-m", "pip", "list"],
-  ["python", "-m", "pip", "check"],
-  ["python", "-m", "pip", "install", "--no-user", "--upgrade", "--force-reinstall", "--no-deps", "--no-binary", "raven-hydro", "git+https://github.com/Ouranosinc/raven-hydro.git@{env:UPSTREAM_BRANCH}"]
-]
-
 [env_run_base]
 description = "Run tests with pytest under {basepython}"
-setenv = {PYTEST_ADDOPTS = "--color=yes --numprocesses=logical --durations=10 --cov=ravenpy --cov-report=lcov", PYTHONPATH = "{toxinidir}", TOX = "{envname}", UPSTREAM_BRANCH = "main"}
-passenv = ["CI", "COVERALLS_*", "GDAL_VERSION", "GITHUB_*", "LD_LIBRARY_PATH", "RAVEN_*", "UPSTREAM_BRANCH"]
+setenv = {PYTEST_ADDOPTS = "--color=yes --numprocesses=logical --durations=10 --cov=ravenpy --cov-report=lcov", PYTHONPATH = "{toxinidir}", TOX = "{envname}"}
+passenv = ["CI", "COVERALLS_*", "GDAL_VERSION", "GITHUB_*", "LD_LIBRARY_PATH", "RAVEN_*"]
 download = true
 install_command = ["python", "-m", "pip", "install", "--no-user", "{opts}", "{packages}"]
 dependency_groups = ["test"]
 extras = ["raven-hydro"]
+deps = [
+  {replace = "if", condition = "env.RAVEN_HYDRO_UPSTREAM_BRANCH", then = ["git+https://github.com/Ouranosinc/raven-hydro.git@{env:RAVEN_HYDRO_UPSTREAM_BRANCH}"], extend = true}
+]
 commands_pre = [
   ["python", "-m", "pip", "list"],
   ["python", "-m", "pip", "check"]
@@ -67,7 +62,8 @@ commands_post = [
 ]
 
 [gh.python]
-"3.10" = ["upstream"]
+"3.10" = ["py3.10"]
 "3.11" = ["py3.11"]
 "3.12" = ["py3.12"]
 "3.13" = ["py3.13"]
+"3.14" = ["py3.14"]