Revert changes in basemap-data and basemap-data-hires workflows

matplotlib · Feb 5, 2022 · 0f16ca8 · 0f16ca8
1 parent 30e1243
commit 0f16ca8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
@@ -46,10 +46,11 @@ jobs:
           name: checkout
           path: .
       -
-        name: Build wheel
+        name: Build sdist and wheel
         run: |
           cd ${{ env.PKGDIR }}
-          python setup.py sdist bdist_wheel
+          python setup.py sdist
+          pip wheel -w dist --no-deps dist/*.zip
       -
         name: Upload build artifacts
         uses: actions/upload-artifact@v1
@@ -82,14 +83,12 @@ jobs:
           name: artifacts-build
           path: ${{ env.PKGDIR }}/dist
       -
-        name: Install and test wheel package
+        name: Install wheel package
         run: |
-          pip install --ignore-installed ${{ env.PKGDIR }}/dist/*.whl
-          python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
+          pip install ${{ env.PKGDIR }}/dist/*.whl
       -
-        name: Install and test sdist package
+        name: Test wheel package
         run: |
-          pip install --ignore-installed ${{ env.PKGDIR }}/dist/*.zip
           python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
 
   upload:

diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
@@ -46,10 +46,11 @@ jobs:
           name: checkout
           path: .
       -
-        name: Build wheel
+        name: Build sdist and wheel
         run: |
           cd ${{ env.PKGDIR }}
-          python setup.py sdist bdist_wheel
+          python setup.py sdist
+          pip wheel -w dist --no-deps dist/*.zip
       -
         name: Upload build artifacts
         uses: actions/upload-artifact@v1
@@ -82,14 +83,12 @@ jobs:
           name: artifacts-build
           path: ${{ env.PKGDIR }}/dist
       -
-        name: Install and test wheel package
+        name: Install wheel package
         run: |
-          pip install --ignore-installed ${{ env.PKGDIR }}/dist/*.whl
-          python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
+          pip install ${{ env.PKGDIR }}/dist/*.whl
       -
-        name: Install and test sdist package
+        name: Test wheel package
         run: |
-          pip install --ignore-installed ${{ env.PKGDIR }}/dist/*.zip
           python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
 
   upload: