From 5a50c34f5e6da19b35c2bdf9a4efc105c843282a Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sat, 29 Nov 2025 17:16:50 -0500 Subject: [PATCH 1/2] Py413 in CI matrix + update action versions --- .github/workflows/build_docs.yml | 8 ++++---- .github/workflows/unittests.yml | 21 +++++++++++---------- .github/workflows/upload_package.yml | 8 ++++---- ci/{311.yml => 311-latest.yml} | 1 - ci/311-oldest.yml | 1 - ci/312-latest.yml | 27 +++++++++++++++++++++++++++ ci/{313.yml => 313-latest.yml} | 1 - ci/{313-dev.yml => 314-dev.yml} | 2 +- ci/{312.yml => 314-latest.yml} | 7 ++----- 9 files changed, 49 insertions(+), 27 deletions(-) rename ci/{311.yml => 311-latest.yml} (97%) create mode 100644 ci/312-latest.yml rename ci/{313.yml => 313-latest.yml} (97%) rename ci/{313-dev.yml => 314-dev.yml} (98%) rename ci/{312.yml => 314-latest.yml} (85%) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index a9f8ca5c..038707f9 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -12,7 +12,7 @@ strategy: matrix: os: ['ubuntu-latest'] - environment-file: [ci/312.yml] + environment-file: [ci/314-latest.yml] experimental: [false] defaults: run: @@ -20,12 +20,12 @@ steps: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 # Fetch all history for all branches and tags. - name: Setup micromamba - uses: mamba-org/setup-micromamba@v1 + uses: mamba-org/setup-micromamba@v2 with: environment-file: ${{ matrix.environment-file }} micromamba-version: 'latest' @@ -54,4 +54,4 @@ branch: gh-pages directory: gh-pages github_token: ${{ secrets.GITHUB_TOKEN }} - force: true \ No newline at end of file + force: true diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 92f21654..65fd410c 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -26,17 +26,18 @@ os: [ubuntu-latest] environment-file: [ ci/311-oldest.yml, - ci/311.yml, - ci/312.yml, - ci/313.yml, - ci/313-dev.yml, + ci/311-latest.yml, + ci/312-latest.yml, + ci/313-latest.yml, + ci/314-latest.yml, + ci/314-dev.yml, ] include: - - environment-file: ci/312.yml + - environment-file: ci/314.yml os: macos-15-intel # Intel - - environment-file: ci/312.yml + - environment-file: ci/314.yml os: macos-latest # Apple Silicon - - environment-file: ci/312.yml + - environment-file: ci/314.yml os: windows-latest fail-fast: false @@ -46,12 +47,12 @@ steps: - name: checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 # Fetch all history for all branches and tags. - name: setup micromamba - uses: mamba-org/setup-micromamba@v1 + uses: mamba-org/setup-micromamba@v2 with: environment-file: ${{ matrix.environment-file }} micromamba-version: 'latest' @@ -88,7 +89,7 @@ --cov-report xml . - name: codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/upload_package.yml b/.github/workflows/upload_package.yml index b67a74aa..ae5f6ca5 100644 --- a/.github/workflows/upload_package.yml +++ b/.github/workflows/upload_package.yml @@ -19,10 +19,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Set up python - uses: actions/setup-python@v4 + uses: actions/setup-python@v6 with: python-version: "3.x" @@ -34,7 +34,7 @@ jobs: twine check --strict dist/* - name: Create Release Notes - uses: actions/github-script@v6 + uses: actions/github-script@v8 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | @@ -47,4 +47,4 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ - password: ${{ secrets.PYPI_PASSWORD }} \ No newline at end of file + password: ${{ secrets.PYPI_PASSWORD }} diff --git a/ci/311.yml b/ci/311-latest.yml similarity index 97% rename from ci/311.yml rename to ci/311-latest.yml index 4e5a2035..cfadfe3e 100644 --- a/ci/311.yml +++ b/ci/311-latest.yml @@ -21,7 +21,6 @@ dependencies: - tqdm - codecov - coverage - - pip - pytest - pytest-cov - pytest-mpl diff --git a/ci/311-oldest.yml b/ci/311-oldest.yml index 1bafbe88..d42ba393 100644 --- a/ci/311-oldest.yml +++ b/ci/311-oldest.yml @@ -22,7 +22,6 @@ dependencies: - tqdm=4.67 - codecov - coverage - - pip - pytest - pytest-cov - pytest-mpl diff --git a/ci/312-latest.yml b/ci/312-latest.yml new file mode 100644 index 00000000..514c76a2 --- /dev/null +++ b/ci/312-latest.yml @@ -0,0 +1,27 @@ +name: test +channels: + - conda-forge +dependencies: + - python=3.12 + - astropy + - dask + - dask-geopandas + - geopandas + - h3-py<4 + - joblib + - jupyterlab + - libpysal + - numpy + - pandas + - rasterio + - rasterstats + - scikit-learn + - scipy + - statsmodels + - tqdm + - codecov + - coverage + - pytest + - pytest-cov + - pytest-mpl + - pytest-xdist diff --git a/ci/313.yml b/ci/313-latest.yml similarity index 97% rename from ci/313.yml rename to ci/313-latest.yml index 421f5a7e..206f9998 100644 --- a/ci/313.yml +++ b/ci/313-latest.yml @@ -21,7 +21,6 @@ dependencies: - tqdm - codecov - coverage - - pip - pytest - pytest-cov - pytest-mpl diff --git a/ci/313-dev.yml b/ci/314-dev.yml similarity index 98% rename from ci/313-dev.yml rename to ci/314-dev.yml index 29948a46..cb3f7fa4 100644 --- a/ci/313-dev.yml +++ b/ci/314-dev.yml @@ -2,7 +2,7 @@ name: test channels: - conda-forge dependencies: - - python=3.13 + - python=3.14 - astropy - dask - h3-py diff --git a/ci/312.yml b/ci/314-latest.yml similarity index 85% rename from ci/312.yml rename to ci/314-latest.yml index 03caa6d9..c94c1667 100644 --- a/ci/312.yml +++ b/ci/314-latest.yml @@ -2,12 +2,12 @@ name: test channels: - conda-forge dependencies: - - python=3.12 + - python=3.14 - astropy - dask - dask-geopandas - geopandas - - h3-py<4 + - h3-py - joblib - jupyterlab - libpysal @@ -21,7 +21,6 @@ dependencies: - tqdm - codecov - coverage - - pip - pytest - pytest-cov - pytest-mpl @@ -38,5 +37,3 @@ dependencies: - sphinx-autodoc2 - nbsphinx-link - linkify-it-py - - pip: - - nbsphinx-link>=1.3.1 # not on conda yet From 5906c9fbfb176f425b99230b7b9cfe220badaf15 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sat, 29 Nov 2025 17:23:30 -0500 Subject: [PATCH 2/2] forgot -latest suffix on include --- .github/workflows/unittests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 65fd410c..5c26c09c 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -33,11 +33,11 @@ ci/314-dev.yml, ] include: - - environment-file: ci/314.yml + - environment-file: ci/314-latest.yml os: macos-15-intel # Intel - - environment-file: ci/314.yml + - environment-file: ci/314-latest.yml os: macos-latest # Apple Silicon - - environment-file: ci/314.yml + - environment-file: ci/314-latest.yml os: windows-latest fail-fast: false