Skip to content

Commit

Permalink
Merge branch 'hotfix-1.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@molinav
molinav committed Feb 15, 2024
2 parents 9921f13 + 01b2218 commit c461fa2
Show file tree
Hide file tree
Showing 12 changed files with 216 additions and 132 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/basemap-data-hires.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Upload checkout
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: checkout
path: .
Expand All @@ -43,11 +43,11 @@ jobs:
max-parallel: 1
needs: checkout
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
steps:
-
name: Download checkout
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: checkout
path: .
Expand All @@ -59,7 +59,7 @@ jobs:
pip wheel -w dist --no-deps dist/*.zip
-
name: Upload build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts-build
path: ${{ env.PKGDIR }}/dist
Expand All @@ -69,22 +69,22 @@ jobs:
matrix:
python-version:
["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
"3.9", "3.10", "3.11"]
"3.9", "3.10", "3.11", "3.12"]
max-parallel: 3
fail-fast: false
needs: build
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
steps:
-
name: Download checkout
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: checkout
path: .
-
name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts-build
path: ${{ env.PKGDIR }}/dist
Expand All @@ -106,12 +106,12 @@ jobs:
if: startsWith(github.event.ref, 'refs/tags/v')
needs: test
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
environment: PyPI
steps:
-
name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts-build
path: ${{ env.PKGDIR }}/dist
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/basemap-data.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Upload checkout
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: checkout
path: .
Expand All @@ -43,11 +43,11 @@ jobs:
max-parallel: 1
needs: checkout
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
steps:
-
name: Download checkout
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: checkout
path: .
Expand All @@ -59,7 +59,7 @@ jobs:
pip wheel -w dist --no-deps dist/*.zip
-
name: Upload build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts-build
path: ${{ env.PKGDIR }}/dist
Expand All @@ -69,22 +69,22 @@ jobs:
matrix:
python-version:
["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
"3.9", "3.10", "3.11"]
"3.9", "3.10", "3.11", "3.12"]
max-parallel: 3
fail-fast: false
needs: build
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
steps:
-
name: Download checkout
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: checkout
path: .
-
name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts-build
path: ${{ env.PKGDIR }}/dist
Expand All @@ -106,12 +106,12 @@ jobs:
if: startsWith(github.event.ref, 'refs/tags/v')
needs: test
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
environment: PyPI
steps:
-
name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts-build
path: ${{ env.PKGDIR }}/dist
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/basemap-for-manylinux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ jobs:
name: Upload test artifacts
uses: actions/upload-artifact@v1
with:
name: test
name: artifacts-test
path: ${{ env.PKGDIR }}/.coverage.${{ matrix.python-version }}

coverage:
Expand All @@ -326,7 +326,7 @@ jobs:
name: Download test artifacts
uses: actions/download-artifact@v1
with:
name: test
name: artifacts-test
path: ${{ env.PKGDIR }}
-
name: Install test requirements
Expand All @@ -344,7 +344,7 @@ jobs:
name: Upload coverage artifacts
uses: actions/upload-artifact@v1
with:
name: coverage
name: artifacts-coverage
path: ${{ env.PKGDIR }}/htmlcov

docs:
Expand Down Expand Up @@ -383,13 +383,13 @@ jobs:
name: Upload docs artifacts
uses: actions/upload-artifact@v1
with:
name: docs
name: artifacts-docs
path: ${{ env.PKGDIR }}/public
-
name: Upload github-pages artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
name: github-pages
name: artifacts-github-pages
path: ${{ env.PKGDIR }}/public

pages:
Expand All @@ -404,7 +404,7 @@ jobs:
id-token: write
steps:
- name: Deploy github-pages
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v3
id: deployment

upload:
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/basemap-for-windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Upload checkout
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: checkout
path: .
Expand All @@ -49,7 +49,7 @@ jobs:
steps:
-
name: Download checkout
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: checkout
path: .
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
steps:
-
name: Download checkout
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: checkout
path: .
Expand All @@ -121,7 +121,7 @@ jobs:
toolset: ${{ matrix.msvc-toolset }}
-
name: Set CMake
uses: jwlawson/actions-setup-cmake@v1.13
uses: jwlawson/actions-setup-cmake@v2.0
with:
cmake-version: "3.24.2"
-
Expand All @@ -137,7 +137,7 @@ jobs:
python -c "import utils; utils.GeosLibrary('3.6.5').build('extern', toolset='${{ matrix.msvc-toolset }}', njobs=16)"
-
name: Upload GEOS artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts-geos-${{ matrix.arch }}-msvc${{ matrix.msvc-toolset }}
path: ${{ env.PKGDIR }}/extern
Expand All @@ -156,7 +156,7 @@ jobs:
steps:
-
name: Download checkout
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: checkout
path: .
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
toolset: ${{ env.msvc-toolset }}
-
name: Download GEOS artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts-geos-${{ matrix.arch }}-msvc${{ env.msvc-toolset }}
path: ${{ env.PKGDIR }}/extern
Expand All @@ -212,7 +212,7 @@ jobs:
python -m pip wheel -w dist --no-deps (Get-Item dist/*.zip)
-
name: Upload build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
path: ${{ env.PKGDIR }}/dist
Expand All @@ -235,13 +235,13 @@ jobs:
steps:
-
name: Download checkout
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: checkout
path: .
-
name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
path: ${{ env.PKGDIR }}/dist
Expand Down Expand Up @@ -269,16 +269,16 @@ jobs:
name: Test package
run: |
cd ${{ env.PKGDIR }}
$env:COVERAGE_FILE = ".coverage.${{ matrix.python-version }}"
$env:COVERAGE_FILE = ".coverage.${{ matrix.arch }}.${{ matrix.python-version }}"
python -m pytest `
--cov="mpl_toolkits.basemap" --cov-report=term `
--ignore=dist --ignore=build
-
name: Upload test artifacts
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: test
path: ${{ env.PKGDIR }}/.coverage.${{ matrix.python-version }}
name: artifacts-test-${{ matrix.arch }}-${{ matrix.python-version }}
path: ${{ env.PKGDIR }}/.coverage.${{ matrix.arch }}.${{ matrix.python-version }}

upload:
strategy:
Expand All @@ -301,7 +301,7 @@ jobs:
python-version: ${{ matrix.python-version }}
-
name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
path: ${{ env.PKGDIR }}/dist
Expand Down
Loading

0 comments on commit c461fa2

Please sign in to comment.