Skip to content

Commit c461fa2

Browse files
molinavmolinav
committed
Merge branch 'hotfix-1.4.1'
2 parents 9921f13 + 01b2218 commit c461fa2

12 files changed

Lines changed: 216 additions & 132 deletions

File tree

‎.github/workflows/basemap-data-hires.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
steps:
2828
-
2929
name: Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
-
3232
name: Upload checkout
33-
uses: actions/upload-artifact@v3
33+
uses: actions/upload-artifact@v4
3434
with:
3535
name: checkout
3636
path: .
@@ -43,11 +43,11 @@ jobs:
4343
max-parallel: 1
4444
needs: checkout
4545
runs-on: ubuntu-latest
46-
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
46+
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
4747
steps:
4848
-
4949
name: Download checkout
50-
uses: actions/download-artifact@v3
50+
uses: actions/download-artifact@v4
5151
with:
5252
name: checkout
5353
path: .
@@ -59,7 +59,7 @@ jobs:
5959
pip wheel -w dist --no-deps dist/*.zip
6060
-
6161
name: Upload build artifacts
62-
uses: actions/upload-artifact@v3
62+
uses: actions/upload-artifact@v4
6363
with:
6464
name: artifacts-build
6565
path: ${{ env.PKGDIR }}/dist
@@ -69,22 +69,22 @@ jobs:
6969
matrix:
7070
python-version:
7171
["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
72-
"3.9", "3.10", "3.11"]
72+
"3.9", "3.10", "3.11", "3.12"]
7373
max-parallel: 3
7474
fail-fast: false
7575
needs: build
7676
runs-on: ubuntu-latest
77-
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
77+
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
7878
steps:
7979
-
8080
name: Download checkout
81-
uses: actions/download-artifact@v3
81+
uses: actions/download-artifact@v4
8282
with:
8383
name: checkout
8484
path: .
8585
-
8686
name: Download build artifacts
87-
uses: actions/download-artifact@v3
87+
uses: actions/download-artifact@v4
8888
with:
8989
name: artifacts-build
9090
path: ${{ env.PKGDIR }}/dist
@@ -106,12 +106,12 @@ jobs:
106106
if: startsWith(github.event.ref, 'refs/tags/v')
107107
needs: test
108108
runs-on: ubuntu-latest
109-
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
109+
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
110110
environment: PyPI
111111
steps:
112112
-
113113
name: Download build artifacts
114-
uses: actions/download-artifact@v3
114+
uses: actions/download-artifact@v4
115115
with:
116116
name: artifacts-build
117117
path: ${{ env.PKGDIR }}/dist

‎.github/workflows/basemap-data.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
steps:
2828
-
2929
name: Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
-
3232
name: Upload checkout
33-
uses: actions/upload-artifact@v3
33+
uses: actions/upload-artifact@v4
3434
with:
3535
name: checkout
3636
path: .
@@ -43,11 +43,11 @@ jobs:
4343
max-parallel: 1
4444
needs: checkout
4545
runs-on: ubuntu-latest
46-
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
46+
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
4747
steps:
4848
-
4949
name: Download checkout
50-
uses: actions/download-artifact@v3
50+
uses: actions/download-artifact@v4
5151
with:
5252
name: checkout
5353
path: .
@@ -59,7 +59,7 @@ jobs:
5959
pip wheel -w dist --no-deps dist/*.zip
6060
-
6161
name: Upload build artifacts
62-
uses: actions/upload-artifact@v3
62+
uses: actions/upload-artifact@v4
6363
with:
6464
name: artifacts-build
6565
path: ${{ env.PKGDIR }}/dist
@@ -69,22 +69,22 @@ jobs:
6969
matrix:
7070
python-version:
7171
["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
72-
"3.9", "3.10", "3.11"]
72+
"3.9", "3.10", "3.11", "3.12"]
7373
max-parallel: 3
7474
fail-fast: false
7575
needs: build
7676
runs-on: ubuntu-latest
77-
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
77+
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
7878
steps:
7979
-
8080
name: Download checkout
81-
uses: actions/download-artifact@v3
81+
uses: actions/download-artifact@v4
8282
with:
8383
name: checkout
8484
path: .
8585
-
8686
name: Download build artifacts
87-
uses: actions/download-artifact@v3
87+
uses: actions/download-artifact@v4
8888
with:
8989
name: artifacts-build
9090
path: ${{ env.PKGDIR }}/dist
@@ -106,12 +106,12 @@ jobs:
106106
if: startsWith(github.event.ref, 'refs/tags/v')
107107
needs: test
108108
runs-on: ubuntu-latest
109-
container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
109+
container: "pylegacy/python:${{ matrix.python-version }}-debian-10"
110110
environment: PyPI
111111
steps:
112112
-
113113
name: Download build artifacts
114-
uses: actions/download-artifact@v3
114+
uses: actions/download-artifact@v4
115115
with:
116116
name: artifacts-build
117117
path: ${{ env.PKGDIR }}/dist

‎.github/workflows/basemap-for-manylinux.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ jobs:
311311
name: Upload test artifacts
312312
uses: actions/upload-artifact@v1
313313
with:
314-
name: test
314+
name: artifacts-test
315315
path: ${{ env.PKGDIR }}/.coverage.${{ matrix.python-version }}
316316

317317
coverage:
@@ -326,7 +326,7 @@ jobs:
326326
name: Download test artifacts
327327
uses: actions/download-artifact@v1
328328
with:
329-
name: test
329+
name: artifacts-test
330330
path: ${{ env.PKGDIR }}
331331
-
332332
name: Install test requirements
@@ -344,7 +344,7 @@ jobs:
344344
name: Upload coverage artifacts
345345
uses: actions/upload-artifact@v1
346346
with:
347-
name: coverage
347+
name: artifacts-coverage
348348
path: ${{ env.PKGDIR }}/htmlcov
349349

350350
docs:
@@ -383,13 +383,13 @@ jobs:
383383
name: Upload docs artifacts
384384
uses: actions/upload-artifact@v1
385385
with:
386-
name: docs
386+
name: artifacts-docs
387387
path: ${{ env.PKGDIR }}/public
388388
-
389389
name: Upload github-pages artifact
390-
uses: actions/upload-pages-artifact@v2
390+
uses: actions/upload-pages-artifact@v3
391391
with:
392-
name: github-pages
392+
name: artifacts-github-pages
393393
path: ${{ env.PKGDIR }}/public
394394

395395
pages:
@@ -404,7 +404,7 @@ jobs:
404404
id-token: write
405405
steps:
406406
- name: Deploy github-pages
407-
uses: actions/deploy-pages@v2
407+
uses: actions/deploy-pages@v3
408408
id: deployment
409409

410410
upload:

‎.github/workflows/basemap-for-windows.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
steps:
3030
-
3131
name: Checkout
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333
-
3434
name: Upload checkout
35-
uses: actions/upload-artifact@v3
35+
uses: actions/upload-artifact@v4
3636
with:
3737
name: checkout
3838
path: .
@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
-
5151
name: Download checkout
52-
uses: actions/download-artifact@v3
52+
uses: actions/download-artifact@v4
5353
with:
5454
name: checkout
5555
path: .
@@ -109,7 +109,7 @@ jobs:
109109
steps:
110110
-
111111
name: Download checkout
112-
uses: actions/download-artifact@v3
112+
uses: actions/download-artifact@v4
113113
with:
114114
name: checkout
115115
path: .
@@ -121,7 +121,7 @@ jobs:
121121
toolset: ${{ matrix.msvc-toolset }}
122122
-
123123
name: Set CMake
124-
uses: jwlawson/actions-setup-cmake@v1.13
124+
uses: jwlawson/actions-setup-cmake@v2.0
125125
with:
126126
cmake-version: "3.24.2"
127127
-
@@ -137,7 +137,7 @@ jobs:
137137
python -c "import utils; utils.GeosLibrary('3.6.5').build('extern', toolset='${{ matrix.msvc-toolset }}', njobs=16)"
138138
-
139139
name: Upload GEOS artifacts
140-
uses: actions/upload-artifact@v3
140+
uses: actions/upload-artifact@v4
141141
with:
142142
name: artifacts-geos-${{ matrix.arch }}-msvc${{ matrix.msvc-toolset }}
143143
path: ${{ env.PKGDIR }}/extern
@@ -156,7 +156,7 @@ jobs:
156156
steps:
157157
-
158158
name: Download checkout
159-
uses: actions/download-artifact@v3
159+
uses: actions/download-artifact@v4
160160
with:
161161
name: checkout
162162
path: .
@@ -198,7 +198,7 @@ jobs:
198198
toolset: ${{ env.msvc-toolset }}
199199
-
200200
name: Download GEOS artifacts
201-
uses: actions/download-artifact@v3
201+
uses: actions/download-artifact@v4
202202
with:
203203
name: artifacts-geos-${{ matrix.arch }}-msvc${{ env.msvc-toolset }}
204204
path: ${{ env.PKGDIR }}/extern
@@ -212,7 +212,7 @@ jobs:
212212
python -m pip wheel -w dist --no-deps (Get-Item dist/*.zip)
213213
-
214214
name: Upload build artifacts
215-
uses: actions/upload-artifact@v3
215+
uses: actions/upload-artifact@v4
216216
with:
217217
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
218218
path: ${{ env.PKGDIR }}/dist
@@ -235,13 +235,13 @@ jobs:
235235
steps:
236236
-
237237
name: Download checkout
238-
uses: actions/download-artifact@v3
238+
uses: actions/download-artifact@v4
239239
with:
240240
name: checkout
241241
path: .
242242
-
243243
name: Download build artifacts
244-
uses: actions/download-artifact@v3
244+
uses: actions/download-artifact@v4
245245
with:
246246
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
247247
path: ${{ env.PKGDIR }}/dist
@@ -269,16 +269,16 @@ jobs:
269269
name: Test package
270270
run: |
271271
cd ${{ env.PKGDIR }}
272-
$env:COVERAGE_FILE = ".coverage.${{ matrix.python-version }}"
272+
$env:COVERAGE_FILE = ".coverage.${{ matrix.arch }}.${{ matrix.python-version }}"
273273
python -m pytest `
274274
--cov="mpl_toolkits.basemap" --cov-report=term `
275275
--ignore=dist --ignore=build
276276
-
277277
name: Upload test artifacts
278-
uses: actions/upload-artifact@v1
278+
uses: actions/upload-artifact@v4
279279
with:
280-
name: test
281-
path: ${{ env.PKGDIR }}/.coverage.${{ matrix.python-version }}
280+
name: artifacts-test-${{ matrix.arch }}-${{ matrix.python-version }}
281+
path: ${{ env.PKGDIR }}/.coverage.${{ matrix.arch }}.${{ matrix.python-version }}
282282

283283
upload:
284284
strategy:
@@ -301,7 +301,7 @@ jobs:
301301
python-version: ${{ matrix.python-version }}
302302
-
303303
name: Download build artifacts
304-
uses: actions/download-artifact@v3
304+
uses: actions/download-artifact@v4
305305
with:
306306
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
307307
path: ${{ env.PKGDIR }}/dist

0 commit comments

Comments
 (0)