Merge branch 'issue-packaging-files' into develop

Author: molinav

.github/workflows/build.yml

@@ -1,5 +1,3 @@
-name: Build
-
 on:
   push:
     paths:
@@ -17,7 +15,7 @@ on:
 
 jobs:
   build_data:
-    name: Build data packages
+    name: Build data
     strategy:
       matrix:
         package: [basemap_data, basemap_data_hires]
@@ -30,21 +28,22 @@ jobs:
         with:
           python-version: "3.9"
 
-      - name: Build sdist and wheels
+      - name: Build data sdist and wheel
         run: |
           cd packages/${{ matrix.package }}
           python -m pip install build wheel
           python -m build
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload data sdist and wheel
+        uses: actions/upload-artifact@v4
         with:
           path: |
             packages/${{ matrix.package }}/dist/*.tar.gz
             packages/${{ matrix.package }}/dist/*.whl
           name: dist-${{ matrix.package }}
 
   build_sdist:
-    name: Build basemap sdist
+    name: Build sdist
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -54,23 +53,24 @@ jobs:
         with:
           python-version: "3.9"
 
-      - name: Build sdist
+      - name: Build basemap sdist
         run: |
           cd packages/basemap
           python -m pip install build
           python -m build --sdist
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload basemap sdist
+        uses: actions/upload-artifact@v4
         with:
           path: packages/basemap/dist/*.tar.gz
           name: dist-basemap-sdist
 
   build_wheels:
-    name: Build basemap wheels
+    name: Build wheels
     needs: [build_data, build_sdist]
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2019, macos-13, macos-14]
+        os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -80,44 +80,13 @@ jobs:
         with:
           python-version: "3.9"
 
-      - name: Download data packages
-        uses: actions/download-artifact@v4
-        with:
-          pattern: dist-basemap_data*
-          path: ./data_packages/
-          merge-multiple: true
-
-      - name: Install data packages (Linux/macOS)
-        if: runner.os != 'Windows'
-        shell: bash
-        run: |
-          # Install the wheel data packages with wildcard
-          python -m pip install ./data_packages/*.whl
-
-          # Verify that the data packages can be imported
-          python -c "import mpl_toolkits.basemap_data; print('mpl_toolkits.basemap_data installed successfully')"
-
-      - name: Install data packages (Windows)
-        if: runner.os == 'Windows'
-        shell: pwsh
-        run: |
-          # Install the wheel data packages sequentially
-          $wheels = Get-ChildItem -Path "./data_packages" -Filter "*.whl" -Recurse
-          foreach ($wheel in $wheels) {
-            Write-Host "Installing $($wheel.FullName)"
-            python -m pip install $wheel.FullName
-          }
-
-          # Verify that the data packages can be imported
-          python -c "import mpl_toolkits.basemap_data; print('mpl_toolkits.basemap_data installed successfully')"
-
       - name: Download basemap sdist
         uses: actions/download-artifact@v4
         with:
           name: dist-basemap-sdist
           path: ./sdist/
 
-      - name: Extract sdist (Linux/macOS)
+      - name: Extract basemap sdist (Linux/macOS)
         if: runner.os != 'Windows'
         shell: bash
         run: |
@@ -136,7 +105,7 @@ jobs:
           # Set the environment variable
           echo "SDIST_DIR=$(pwd)/${EXTRACTED_DIR}" >> $GITHUB_ENV
 
-      - name: Extract sdist (Windows)
+      - name: Extract basemap sdist (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
@@ -156,7 +125,7 @@ jobs:
           # Set the environment variable
           echo "SDIST_DIR=$extractedDir" | Out-File -FilePath $env:GITHUB_ENV -Append
 
-      - name: Build wheels from sdist
+      - name: Build basemap wheels from sdist
         uses: pypa/[email protected]
         env:
           CIBW_ARCHS: "native"
@@ -184,7 +153,8 @@ jobs:
           # folder and we cannot guarantee that wheels can be built
           # from the sdist.
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload basemap wheels
+        uses: actions/upload-artifact@v4
         with:
           path: dist/*.whl
           name: dist-basemap-wheels-${{ matrix.os }}
@@ -194,7 +164,8 @@ jobs:
     needs: [build_data, build_sdist, build_wheels]
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/download-artifact@v4
+      - name: Download basemap and data packages
+        uses: actions/download-artifact@v4
         with:
           path: dist
           pattern: "dist-*"
@@ -212,8 +183,8 @@ jobs:
           python -m twine check dist/*.whl
 
   docs:
-    name: Build documentation
-    needs: [build_wheels]
+    name: Build docs
+    needs: [check]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -230,14 +201,14 @@ jobs:
           pattern: "dist-basemap_data*"
           merge-multiple: true
 
-      - name: Download basemap wheel for Linux
+      - name: Download basemap wheels for Linux
         uses: actions/download-artifact@v4
         with:
           path: ./wheels/
           pattern: "dist-basemap-wheels-ubuntu-*"
           merge-multiple: true
 
-      - name: Install packages
+      - name: Install basemap and data packages
         run: |
           # Get Python version.
           IMPL=cp$(python -c "import sys; print('{0}{1}'.format(*sys.version_info[:2]))")
@@ -257,7 +228,7 @@ jobs:
       - name: Install docs requirements
         run: |
           cd packages/basemap
-          python -m pip install -r requirements-doc.txt
+          python -m pip install -r dep/requirements-doc.txt
 
       - name: Run sphinx
         run: |
@@ -277,9 +248,9 @@ jobs:
           path: packages/basemap/public
 
   pages:
-    name: Deploy documentation
+    name: Deploy docs
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    needs: [docs, check]
+    needs: [docs]
     runs-on: ubuntu-22.04
     environment:
       name: github-pages
@@ -299,7 +270,8 @@ jobs:
     environment: PyPI
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/download-artifact@v4
+      - name: Download basemap and data packages
+        uses: actions/download-artifact@v4
         with:
           path: dist
           pattern: "dist-*"

CHANGELOG.md

@@ -24,25 +24,30 @@ https://semver.org/spec/v2.0.0.html
 - **BREAKING CHANGE**: Set Python minimum supported version to 3.9.
 - **BREAKING CHANGE**: Migrate `basemap` libraries to use implicit
   namespace packages (PR [#576] by @ksunden).
+- **BREAKING CHANGE**: Move requirements files to its own `dep` folder.
 - Migrate workflows to use `cibuildwheel` (PRs [#614], [#618], [#622]
   and [#623] by @cvanelteren and PR [#621], solves GitHub artifact
   actions v1 sunset).
 - Update library dependencies:
   - Upgrade upper limit for `basemap_data` to 3.0.
   - Upgrade lower limit for `packaging` to 20.5.
-  - Upgrade upper limit for `packaging` to 25.0.
+  - Upgrade upper limit for `packaging` to 26.0.
   - Upgrade lower limit for `numpy` to 2.0.
-  - Upgrade upper limit for `numpy` to 2.3.
+  - Upgrade upper limit for `numpy` to 2.4.
   - Upgrade lower limit for `matplotlib` to 3.4.
   - Upgrade upper limit for `matplotlib` to 3.11.
   - Upgrade lower limit for `pyproj` to 3.0.
   - Upgrade upper limit for `pyproj` to 3.8.
   - Upgrade lower limit for `pyshp` to 2.0.
 - Update optional library dependencies:
-  - Upgrade lower limit for `pillow` to 10.3 due to
-    vulnerabilities [CVE-2023-50447] and [CVE-2024-28219].
-  - Upgrade upper limit for `pillow` to 11.2.
-  - Upgrade upper limit for `OWSLib` to 0.33.
+  - Upgrade upper limit for `OWSLib` to 0.35.
+- Update build dependencies:
+  - Upgrade lower limit for `setuptools` to 67.0.
+  - Upgrade upper limit for `setuptools` to 81.0.
+  - Upgrade lower limit for `wheel` to 0.40.
+  - Upgrade upper limit for `wheel` to 0.46.
+  - Upgrade lower limit for `cython` to 3.0.
+  - Upgrade upper limit for `cython` to 3.2.
 - Update doc dependencies:
   - Upgrade upper limit for `sphinx` to 8.0.
   - Upgrade lower limit for `furo` to 2023.9.10.
@@ -53,27 +58,32 @@ https://semver.org/spec/v2.0.0.html
 - Update lint dependencies:
   - Remove dependency on `unittest2`.
   - Upgrade lower limit for `flake8` to 3.9.
-  - Upgrade upper limit for `flake8` to 7.2.
+  - Upgrade upper limit for `flake8` to 7.3.
+  - Include dependency on `flake8-pyproject`.
   - Upgrade lower limit for `astroid` to 3.0.
   - Upgrade upper limit for `astroid` to 3.4.
   - Upgrade lower limit for `pylint` to 3.0.
   - Upgrade upper limit for `pylint` to 3.4.
 - Update test dependencies:
   - Remove dependency on `unittest2`.
   - Upgrade lower limit for `pytest` to 7.0.
-  - Upgrade upper limit for `pytest` to 8.4.
+  - Upgrade upper limit for `pytest` to 8.5.
   - Upgrade lower limit for `pytest-cov` to 3.0.
-  - Upgrade upper limit for `pytest-cov` to 6.1.
+  - Upgrade upper limit for `pytest-cov` to 6.3.
   - Downgrade lower limit for `coverage` to 5.0.
-  - Upgrade upper limit for `coverage` to 7.7.
+  - Upgrade upper limit for `coverage` to 7.10.
 
 ### Fixed
 - Fix Cython extension to use `noexcept` (PR [#615] by @cvanelteren).
 - Fix incorrect return order described in `Basemap.shiftdata` docstring
   (PR [#624] by @Cdiaz1234, solves issue [#599]).
 
 ### Removed
+- Deprecated use of `setup_requires` in `setup.py` file.
 - Deprecated `bdist_wheel.universal` option when building wheels.
+- Configuration of `sdist` format as zip (replaced by default tar.gz).
+- Remove `pillow` as optional dependency, since it is now a transitive
+  dependency through `matplotlib >= 3.3`.
 
 ## [1.4.1] - 2024-02-15
 
@@ -121,7 +131,7 @@ https://semver.org/spec/v2.0.0.html
   - Downgrade upper limit for `pyproj` to 2.2.0 for Python 2.7.
   - Set dependency on `packaging` as replacement for `distutils`.
 - Update build dependencies:
-  - Upgrade upper limit for `Cython` to 3.1.
+  - Upgrade upper limit for `cython` to 3.1.
 - Update doc dependencies and require at least Python 3.8 for them:
   - Upgrade upper limit for `sphinx` to 7.2.
   - Upgrade upper limit for `furo` to 2023.9.11.

LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2011-2014 Jeffrey Whitaker
-Copyright (c) 2015-2024 The Matplotlib development team
+Copyright (c) 2015-2025 The Matplotlib development team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the