From 7506e3790b191f8bedd4c1945e8d547b38096bab Mon Sep 17 00:00:00 2001 From: cvanelteren Date: Fri, 24 Jan 2025 13:43:47 +0100 Subject: [PATCH 1/5] update build system and rebuild with numpy >= 2.0 --- packages/basemap/build_geos.py | 27 ++++++ packages/basemap/pyproject.toml | 86 ++++++++++++++++--- packages/basemap/requirements.txt | 2 +- packages/basemap/src/_geoslib.pyx | 3 - .../src/mpl_toolkits/basemap/__init__.py | 11 +++ 5 files changed, 114 insertions(+), 15 deletions(-) create mode 100644 packages/basemap/build_geos.py diff --git a/packages/basemap/build_geos.py b/packages/basemap/build_geos.py new file mode 100644 index 000000000..66f518002 --- /dev/null +++ b/packages/basemap/build_geos.py @@ -0,0 +1,27 @@ +import os +import sys +from pathlib import Path + + +def build_geos(): + GEOS_DIR = os.environ.get("GEOS_DIR", str(Path.home() / ".local" / "geos")) + + try: + import utils + + geos = utils.GeosLibrary("3.6.5") + geos.build(installdir=GEOS_DIR) + + # Add GEOS directory to environment variables + os.environ["GEOS_DIR"] = GEOS_DIR + os.environ["LD_LIBRARY_PATH"] = ( + f"{GEOS_DIR}/lib:{os.environ.get('LD_LIBRARY_PATH', '')}" + ) + + except Exception as e: + print(f"Error building GEOS: {e}", file=sys.stderr) + sys.exit(1) + + +if __name__ == "__main__": + build_geos() diff --git a/packages/basemap/pyproject.toml b/packages/basemap/pyproject.toml index 6a50e2c78..b61e413d1 100644 --- a/packages/basemap/pyproject.toml +++ b/packages/basemap/pyproject.toml @@ -1,15 +1,79 @@ +[project] +name = "basemap" +description = "Plot data on map projections with matplotlib" +readme = "README.md" +requires-python = ">=3.7" +license = {text = "MIT"} +authors = [ + {name = "Jeff Whitaker", email = "jeffrey.s.whitaker@noaa.gov"}, +] +maintainers = [ + {name = "Matplotlib Developers", email = "matplotlib-developers@python.org"} +] +keywords = ["matplotlib", "mapping", "map projections", "gis"] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Topic :: Scientific/Engineering :: GIS", + "Topic :: Scientific/Engineering :: Visualization", +] +dependencies = [ + "numpy>=1.16", + "matplotlib>=3.1", + "pyproj>=3.0", + "pyshp>=2.1", +] +dynamic = ["version"] + +[project.urls] +Homepage = "https://matplotlib.org/basemap" +Documentation = "https://matplotlib.org/basemap/users/intro.html" +Repository = "https://github.com/matplotlib/basemap" +"Bug Tracker" = "https://github.com/matplotlib/basemap/issues" + [build-system] requires = [ - 'setuptools', - 'wheel', - 'numpy == 1.26.1; python_version >= "3.12"', - 'numpy == 1.23.3; python_version == "3.11"', - 'numpy == 1.21.4; python_version == "3.10"', - 'numpy == 1.21.4; sys_platform == "darwin" and (python_version >= "3.7" and python_version <= "3.9")', - 'numpy == 1.16.6; sys_platform != "darwin" and (python_version >= "3.7" and python_version <= "3.9")', - 'numpy == 1.16.6; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.6")', - 'numpy == 1.11.3; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")', - 'cython >= 0.29, < 3.1; python_version >= "3.3" or python_version < "3.0"', - 'cython >= 0.26, < 0.27; python_version == "3.2"' + "setuptools>=45", + "wheel", + "setuptools_scm[toml]>=6.2", + "numpy >= 2.0.0; python_version >= '3.10'", + "numpy == 1.21.4; sys_platform == 'darwin' and (python_version >= '3.7' and python_version <= '3.9')", + "numpy == 1.16.6; sys_platform != 'darwin' and (python_version >= '3.7' and python_version <= '3.9')", + "cython>=0.29,<3.1", + "cmake>=3.12", ] +pre-hook.geos = "build_geos.py" build-backend = "setuptools.build_meta" + +[tool.setuptools] +packages = ["mpl_toolkits.basemap"] +include-package-data = true + +[tool.setuptools_scm] +write_to = "basemap/_scm_version.py" +version_scheme = "post-release" +local_scheme = "node-and-timestamp" + + +[tool.geos] +version = "3.6.5" +build-options = { enable-shared = true, enable-static = false } +install-dir = "${GEOS_DIR}" + +[tool.setuptools.package-data] +"mpl_toolkits.basemap" = [ + "data/*", + "data/boundaryfiles/*", + "data/5min/*", + "data/10min/*", +] + +[tool.setuptools.exclude-package-data] +"*" = ["*.pyc", "*.pyo", "*.pyd", "*.so", "*.dylib"] diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt index 7e10e9c1b..189855c98 100644 --- a/packages/basemap/requirements.txt +++ b/packages/basemap/requirements.txt @@ -18,7 +18,7 @@ matplotlib >= 1.5, < 3.0; python_version == "2.7" matplotlib >= 1.5, < 2.0; python_version == "3.2" matplotlib >= 1.5, < 2.0; python_version == "3.3" matplotlib >= 1.5, < 3.0; python_version == "3.4" -matplotlib >= 1.5, < 3.9; python_version >= "3.5" +matplotlib >= 1.5, < 3.10; python_version >= "3.5" pyproj >= 1.9.3, < 2.1.0; python_version == "2.6" pyproj >= 1.9.3, < 2.2.0; python_version == "2.7" diff --git a/packages/basemap/src/_geoslib.pyx b/packages/basemap/src/_geoslib.pyx index 676ac4d4b..18f481d83 100644 --- a/packages/basemap/src/_geoslib.pyx +++ b/packages/basemap/src/_geoslib.pyx @@ -2,9 +2,6 @@ import sys import numpy cimport numpy as cnp -__version__ = "1.5.0-dev" - - # Need some Python C-API functions for strings. cdef extern from "Python.h": object PyBytes_FromString(char *) diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py index a7050beed..a40cec8b0 100644 --- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py +++ b/packages/basemap/src/mpl_toolkits/basemap/__init__.py @@ -14,6 +14,17 @@ :func:`addcyclic`: Add cyclic (wraparound) point in longitude. """ +# SCM versioning +name = "basemap" +try: + from importlib.metadata import version as get_version + version = __version__ = get_version(name) +except Exception: + try: + from ._scm_version import version as __version__ + version = __version__ + except ImportError: + version = __version__ = "unknown" import os import sys From c9b65631034ca159b25809bab8749873ae961f3b Mon Sep 17 00:00:00 2001 From: cvanelteren Date: Fri, 24 Jan 2025 14:34:58 +0100 Subject: [PATCH 2/5] bump upload artefact --- .github/workflows/basemap-for-manylinux.yml | 226 ++++++++++---------- 1 file changed, 112 insertions(+), 114 deletions(-) diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml index 617568c9a..1ee043689 100644 --- a/.github/workflows/basemap-for-manylinux.yml +++ b/.github/workflows/basemap-for-manylinux.yml @@ -21,16 +21,13 @@ on: workflow_dispatch: jobs: - checkout: runs-on: ubuntu-latest steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v1 - - - name: Upload checkout - uses: actions/upload-artifact@v1 + - name: Upload checkout + uses: actions/upload-artifact@v3 with: name: checkout path: . @@ -40,37 +37,42 @@ jobs: strategy: matrix: python-version: - ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + [ + "2.7", + "3.5", + "3.6", + "3.7", + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", + ] max-parallel: 3 fail-fast: false needs: checkout container: "pylegacy/python:${{ matrix.python-version }}-debian-10" steps: - - - name: Download checkout + - name: Download checkout uses: actions/download-artifact@v1 with: name: checkout path: . - - - name: Install lint requirements + - name: Install lint requirements run: | cd ${{ env.PKGDIR }} pip install -r requirements-lint.txt - - - name: Install library requirements + - name: Install library requirements run: | cd ${{ env.PKGDIR }} pip install -r requirements.txt - - - name: Run Flake8 + - name: Run Flake8 run: | cd ${{ env.PKGDIR }} if [ -x "$(command -v flake8)" ]; then flake8 src/mpl_toolkits/basemap/cm.py src/mpl_toolkits/basemap/diagnostic.py src/mpl_toolkits/basemap/proj.py src/mpl_toolkits/basemap/solar.py test; fi - - - name: Run PyLint + - name: Run PyLint run: | cd ${{ env.PKGDIR }} if [ -x "$(command -v pylint)" ]; then @@ -80,22 +82,19 @@ jobs: build-geos: strategy: matrix: - arch: - ["x64", "x86"] + arch: ["x64", "x86"] max-parallel: 2 fail-fast: false needs: lint runs-on: ubuntu-latest container: "pylegacy/${{ matrix.arch }}-python:3.8-debian-4" steps: - - - name: Download checkout + - name: Download checkout uses: actions/download-artifact@v1 with: name: checkout path: . - - - name: Install CMake 3.6.2 + - name: Install CMake 3.6.2 run: | apt-get update apt-get install -y libidn11 @@ -109,19 +108,16 @@ jobs: wget https://github.com/Kitware/CMake/releases/download/v${pkgvers}/${pkgfile} -P /tmp tar -xf /tmp/${pkgfile} --strip-components=1 -C /usr rm -rf /tmp/${pkgfile} - - - name: Install GCC toolchain + - name: Install GCC toolchain run: | apt-get update apt-get install -y gcc g++ make - - - name: Build GEOS from source + - name: Build GEOS from source run: | cd ${{ env.PKGDIR }} python -c "import utils; utils.GeosLibrary('3.6.5').build('extern', njobs=16)" - - - name: Upload GEOS artifacts - uses: actions/upload-artifact@v1 + - name: Upload GEOS artifacts + uses: actions/upload-artifact@v4 with: name: artifacts-geos-${{ matrix.arch }} path: ${{ env.PKGDIR }}/extern @@ -129,35 +125,40 @@ jobs: build: strategy: matrix: - arch: - ["x64", "x86"] + arch: ["x64", "x86"] python-version: - ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + [ + "2.7", + "3.5", + "3.6", + "3.7", + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", + ] max-parallel: 3 fail-fast: false needs: build-geos runs-on: ubuntu-latest container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-4" steps: - - - name: Download checkout + - name: Download checkout uses: actions/download-artifact@v1 with: name: checkout path: . - - - name: Download GEOS artifacts + - name: Download GEOS artifacts uses: actions/download-artifact@v1 with: name: artifacts-geos-${{ matrix.arch }} path: ${{ env.PKGDIR }}/extern - - - name: Install GCC toolchain + - name: Install GCC toolchain run: | apt-get update apt-get install -y gcc g++ make - - - name: Build old numpy from source + - name: Build old numpy from source run: | case "${{ matrix.arch }}" in x64) arch="x86_64" ;; @@ -185,8 +186,7 @@ jobs: pip install "numpy == ${pkgvers}" ;; esac - - - name: Build wheel + - name: Build wheel run: | sitepkgdir=$(pip show numpy 2>/dev/null | grep Location: | cut -d' ' -f2) export GEOS_DIR="${GITHUB_WORKSPACE}/${{ env.PKGDIR }}/extern" @@ -200,9 +200,8 @@ jobs: cd ${{ env.PKGDIR }} python setup.py sdist pip wheel -w dist --no-deps ${kwds} dist/*.zip - - - name: Upload build artifacts - uses: actions/upload-artifact@v1 + - name: Upload build artifacts + uses: actions/upload-artifact@v4 with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist @@ -210,44 +209,48 @@ jobs: repair: strategy: matrix: - arch: - ["x64", "x86"] + arch: ["x64", "x86"] python-version: - ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + [ + "2.7", + "3.5", + "3.6", + "3.7", + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", + ] max-parallel: 3 fail-fast: false needs: build runs-on: ubuntu-latest container: "pylegacy/${{ matrix.arch }}-python:3.8-debian-10" steps: - - - name: Download GEOS artifacts + - name: Download GEOS artifacts uses: actions/download-artifact@v1 with: name: artifacts-geos-${{ matrix.arch }} path: ${{ env.PKGDIR }}/extern - - - name: Download build artifacts + - name: Download build artifacts uses: actions/download-artifact@v1 with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist - - - name: Install auditwheel + - name: Install auditwheel run: | apt-get update apt-get install -y unzip pip install patchelf pip install "auditwheel < 4.0" - - - name: Repair wheel + - name: Repair wheel run: | cd ${{ env.PKGDIR }} export LD_LIBRARY_PATH="$(readlink -f extern/lib)" auditwheel repair -w dist dist/*.whl - - - name: Upload build artifacts - uses: actions/upload-artifact@v1 + - name: Upload build artifacts + uses: actions/upload-artifact@v4 with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist @@ -255,10 +258,19 @@ jobs: test: strategy: matrix: - arch: - ["x64", "x86"] + arch: ["x64", "x86"] python-version: - ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + [ + "2.7", + "3.5", + "3.6", + "3.7", + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", + ] exclude: # Missing precompiled binaries for `numpy`, `matplotlib`, # `pyproj`, `pillow` and `lxml`. @@ -270,46 +282,39 @@ jobs: runs-on: ubuntu-latest container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-10" steps: - - - name: Download checkout + - name: Download checkout uses: actions/download-artifact@v1 with: name: checkout path: . - - - name: Download build artifacts + - name: Download build artifacts uses: actions/download-artifact@v1 with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist - - - name: Install numpy from source + - name: Install numpy from source run: | apt-get update apt-get install -y gcc g++ make pip install "numpy < 1.24" if: matrix.arch == 'x86' && (matrix.python-version >= '3.8' || matrix.python-version >= '3.10') - - - name: Install test requirements + - name: Install test requirements run: | cd ${{ env.PKGDIR }} pip install -r requirements-test.txt - - - name: Install package (full) + - name: Install package (full) run: | whlpath=$(ls ${{ env.PKGDIR }}/dist/*-manylinux1*.whl | head -n1) pip install "${whlpath}[owslib,pillow]" - - - name: Test package + - name: Test package run: | cd ${{ env.PKGDIR }} export COVERAGE_FILE=.coverage.${{ 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 + - name: Upload test artifacts + uses: actions/upload-artifact@v3 with: name: artifacts-test path: ${{ env.PKGDIR }}/.coverage.${{ matrix.python-version }} @@ -319,30 +324,25 @@ jobs: runs-on: ubuntu-latest container: "pylegacy/python:3.8-debian-10" steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v1 - - - name: Download test artifacts + - name: Download test artifacts uses: actions/download-artifact@v1 with: name: artifacts-test path: ${{ env.PKGDIR }} - - - name: Install test requirements + - name: Install test requirements run: | cd ${{ env.PKGDIR }} pip install -r requirements-test.txt - - - name: Compute combined coverage + - name: Compute combined coverage run: | cd ${{ env.PKGDIR }} coverage combine coverage html coverage report - - - name: Upload coverage artifacts - uses: actions/upload-artifact@v1 + - name: Upload coverage artifacts + uses: actions/upload-artifact@v3 with: name: artifacts-coverage path: ${{ env.PKGDIR }}/htmlcov @@ -352,41 +352,34 @@ jobs: runs-on: ubuntu-latest container: "pylegacy/python:3.8-debian-10" steps: - - - name: Download checkout + - name: Download checkout uses: actions/download-artifact@v1 with: name: checkout path: . - - - name: Install doc requirements + - name: Install doc requirements run: | cd ${{ env.PKGDIR }} pip install -r requirements-doc.txt - - - name: Download build artifacts + - name: Download build artifacts uses: actions/download-artifact@v1 with: name: artifacts-build-x64-3.8 path: ${{ env.PKGDIR }}/dist - - - name: Install package + - name: Install package run: | cd ${{ env.PKGDIR }} pip install dist/*-manylinux1*.whl - - - name: Run sphinx + - name: Run sphinx run: | cd ${{ env.PKGDIR }} python -m sphinx doc/source public - - - name: Upload docs artifacts + - name: Upload docs artifacts uses: actions/upload-artifact@v1 with: name: artifacts-docs path: ${{ env.PKGDIR }}/public - - - name: Upload github-pages artifact + - name: Upload github-pages artifact uses: actions/upload-pages-artifact@v3 with: name: github-pages @@ -410,10 +403,19 @@ jobs: upload: strategy: matrix: - arch: - ["x64", "x86"] + arch: ["x64", "x86"] python-version: - ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + [ + "2.7", + "3.5", + "3.6", + "3.7", + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", + ] max-parallel: 1 if: startsWith(github.event.ref, 'refs/tags/v') needs: test @@ -421,24 +423,20 @@ jobs: container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-10" environment: PyPI steps: - - - name: Download build artifacts + - name: Download build artifacts uses: actions/download-artifact@v1 with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist - - - name: Install upload requirements + - name: Install upload requirements run: | pip install twine - - - name: Check distributables + - name: Check distributables run: | python -m twine check \ ${{ env.PKGDIR }}/dist/*.zip \ ${{ env.PKGDIR }}/dist/*-manylinux1*.whl - - - name: Upload distributables + - name: Upload distributables env: TWINE_USERNAME: __token__ TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}" From cdba6d48beb9d7fe27d4227c60e7c2bb92d8b865 Mon Sep 17 00:00:00 2001 From: cvanelteren Date: Fri, 24 Jan 2025 14:44:15 +0100 Subject: [PATCH 3/5] bump download artifact --- .github/workflows/basemap-for-manylinux.yml | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml index 1ee043689..87098cca0 100644 --- a/.github/workflows/basemap-for-manylinux.yml +++ b/.github/workflows/basemap-for-manylinux.yml @@ -90,7 +90,7 @@ jobs: container: "pylegacy/${{ matrix.arch }}-python:3.8-debian-4" steps: - name: Download checkout - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: checkout path: . @@ -145,12 +145,12 @@ jobs: container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-4" steps: - name: Download checkout - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: checkout path: . - name: Download GEOS artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: artifacts-geos-${{ matrix.arch }} path: ${{ env.PKGDIR }}/extern @@ -229,12 +229,12 @@ jobs: container: "pylegacy/${{ matrix.arch }}-python:3.8-debian-10" steps: - name: Download GEOS artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: artifacts-geos-${{ matrix.arch }} path: ${{ env.PKGDIR }}/extern - name: Download build artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist @@ -283,12 +283,12 @@ jobs: container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-10" steps: - name: Download checkout - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4444 with: name: checkout path: . - name: Download build artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist @@ -327,7 +327,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Download test artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: artifacts-test path: ${{ env.PKGDIR }} @@ -353,7 +353,7 @@ jobs: container: "pylegacy/python:3.8-debian-10" steps: - name: Download checkout - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: checkout path: . @@ -362,7 +362,7 @@ jobs: cd ${{ env.PKGDIR }} pip install -r requirements-doc.txt - name: Download build artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: artifacts-build-x64-3.8 path: ${{ env.PKGDIR }}/dist @@ -424,7 +424,7 @@ jobs: environment: PyPI steps: - name: Download build artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist From b4992249128b3f27c801a200ae68d04a3d9cbb39 Mon Sep 17 00:00:00 2001 From: cvanelteren Date: Fri, 24 Jan 2025 14:46:06 +0100 Subject: [PATCH 4/5] bump download artifact --- .github/workflows/basemap-for-manylinux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml index 87098cca0..a7bd41cfd 100644 --- a/.github/workflows/basemap-for-manylinux.yml +++ b/.github/workflows/basemap-for-manylinux.yml @@ -54,7 +54,7 @@ jobs: container: "pylegacy/python:${{ matrix.python-version }}-debian-10" steps: - name: Download checkout - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: checkout path: . From 8b735b74d1cd4c51071b7305cdf789f2a9f2cb7a Mon Sep 17 00:00:00 2001 From: cvanelteren Date: Fri, 24 Jan 2025 14:46:25 +0100 Subject: [PATCH 5/5] bump download artifact --- .github/workflows/basemap-for-manylinux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml index a7bd41cfd..35e90b04a 100644 --- a/.github/workflows/basemap-for-manylinux.yml +++ b/.github/workflows/basemap-for-manylinux.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Upload checkout uses: actions/upload-artifact@v3 with: @@ -325,7 +325,7 @@ jobs: container: "pylegacy/python:3.8-debian-10" steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Download test artifacts uses: actions/download-artifact@v4 with: @@ -375,7 +375,7 @@ jobs: cd ${{ env.PKGDIR }} python -m sphinx doc/source public - name: Upload docs artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: artifacts-docs path: ${{ env.PKGDIR }}/public