Merge branch 'release-1.4.0'

matplotlib · Jan 9, 2024 · 9921f13 · 9921f13
2 parents 2eac57f + b5a71ee
commit 9921f13
Show file tree

Hide file tree

Showing 157 changed files with 2,942 additions and 1,794 deletions.
diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
@@ -2,11 +2,12 @@ name: basemap-data-hires
 
 env:
   PKGDIR: "packages/basemap_data_hires"
-  PYTHONWARNINGS: "ignore:DEPRECATION"
+  PIP_DEFAULT_TIMEOUT: 10
   PIP_DISABLE_PIP_VERSION_CHECK: 1
   PIP_PREFER_BINARY: 1
-  PIP_TIMEOUT: 10
   PIP_RETRIES: 0
+  PYTHONUNBUFFERED: "1"
+  PYTHONWARNINGS: "ignore:DEPRECATION"
 
 on:
   push:
@@ -29,7 +30,7 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Upload checkout
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: checkout
           path: .
@@ -42,11 +43,11 @@ jobs:
       max-parallel: 1
     needs: checkout
     runs-on: ubuntu-latest
-    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
     steps:
       -
         name: Download checkout
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: checkout
           path: .
@@ -58,7 +59,7 @@ jobs:
           pip wheel -w dist --no-deps dist/*.zip
       -
         name: Upload build artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: artifacts-build
           path: ${{ env.PKGDIR }}/dist
@@ -73,17 +74,17 @@ jobs:
       fail-fast: false
     needs: build
     runs-on: ubuntu-latest
-    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
     steps:
       -
         name: Download checkout
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: checkout
           path: .
       -
         name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: artifacts-build
           path: ${{ env.PKGDIR }}/dist
@@ -105,29 +106,32 @@ jobs:
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test
     runs-on: ubuntu-latest
-    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
     environment: PyPI
     steps:
       -
         name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: artifacts-build
           path: ${{ env.PKGDIR }}/dist
       -
         name: Install upload requirements
         run: |
           pip install twine
+      -
+        name: Check distributables
+        run: |
+          python -m twine check                                               \
+              ${{ env.PKGDIR }}/dist/*.zip                                    \
+              ${{ env.PKGDIR }}/dist/*.whl
       -
         name: Upload distributables
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
           TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
         run: |
-          python -m twine check                                               \
-              ${{ env.PKGDIR }}/dist/*.zip                                    \
-              ${{ env.PKGDIR }}/dist/*.whl
           python -m twine upload --skip-existing                              \
               ${{ env.PKGDIR }}/dist/*.zip                                    \
               ${{ env.PKGDIR }}/dist/*.whl
diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
@@ -2,11 +2,12 @@ name: basemap-data
 
 env:
   PKGDIR: "packages/basemap_data"
-  PYTHONWARNINGS: "ignore:DEPRECATION"
+  PIP_DEFAULT_TIMEOUT: 10
   PIP_DISABLE_PIP_VERSION_CHECK: 1
   PIP_PREFER_BINARY: 1
-  PIP_TIMEOUT: 10
   PIP_RETRIES: 0
+  PYTHONUNBUFFERED: "1"
+  PYTHONWARNINGS: "ignore:DEPRECATION"
 
 on:
   push:
@@ -29,7 +30,7 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Upload checkout
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: checkout
           path: .
@@ -42,11 +43,11 @@ jobs:
       max-parallel: 1
     needs: checkout
     runs-on: ubuntu-latest
-    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
     steps:
       -
         name: Download checkout
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: checkout
           path: .
@@ -58,7 +59,7 @@ jobs:
           pip wheel -w dist --no-deps dist/*.zip
       -
         name: Upload build artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: artifacts-build
           path: ${{ env.PKGDIR }}/dist
@@ -73,17 +74,17 @@ jobs:
       fail-fast: false
     needs: build
     runs-on: ubuntu-latest
-    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
     steps:
       -
         name: Download checkout
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: checkout
           path: .
       -
         name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: artifacts-build
           path: ${{ env.PKGDIR }}/dist
@@ -105,29 +106,32 @@ jobs:
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: test
     runs-on: ubuntu-latest
-    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-9"
     environment: PyPI
     steps:
       -
         name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: artifacts-build
           path: ${{ env.PKGDIR }}/dist
       -
         name: Install upload requirements
         run: |
           pip install twine
+      -
+        name: Check distributables
+        run: |
+          python -m twine check                                               \
+              ${{ env.PKGDIR }}/dist/*.zip                                    \
+              ${{ env.PKGDIR }}/dist/*.whl
       -
         name: Upload distributables
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
           TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
         run: |
-          python -m twine check                                               \
-              ${{ env.PKGDIR }}/dist/*.zip                                    \
-              ${{ env.PKGDIR }}/dist/*.whl
           python -m twine upload --skip-existing                              \
               ${{ env.PKGDIR }}/dist/*.zip                                    \
               ${{ env.PKGDIR }}/dist/*.whl