From 3cf8518262168a42a1b7548b27e89f8e7e476b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Mon, 24 Feb 2025 21:47:46 +0100 Subject: [PATCH 1/5] Bump maximum allowed Python version to <3.14 --- packages/basemap/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/basemap/setup.py b/packages/basemap/setup.py index 1c47e85b..8927ac11 100644 --- a/packages/basemap/setup.py +++ b/packages/basemap/setup.py @@ -207,7 +207,7 @@ def run(self): "python_requires": ", ".join([ ">=3.9", - "<3.13", + "<3.14", ]), "setup_requires": get_content("requirements-setup.txt", splitlines=True), From 831fa515104db6569dd0f2062c72513b8864d9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Mon, 24 Feb 2025 21:48:12 +0100 Subject: [PATCH 2/5] Add cp313 wheels to build matrix in cibuildwheel --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6809fd38..b4a1b275 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: uses: pypa/cibuildwheel@v2.22.0 env: CIBW_BUILD_VERBOSITY: 1 - CIBW_BUILD: "cp39* cp310* cp311* cp312*" + CIBW_BUILD: "cp39* cp310* cp311* cp312* cp313*" CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l" CIBW_BEFORE_ALL: ${{ matrix.before_all }} CIBW_TEST_EXTRAS: "test" From 61077d5bd8e31071176fd50b2e8d11f0f9032a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Mon, 24 Feb 2025 22:10:50 +0100 Subject: [PATCH 3/5] Fix numpy build dependency pin for Python 3.13 --- packages/basemap/pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/basemap/pyproject.toml b/packages/basemap/pyproject.toml index d5dfe290..48161aea 100644 --- a/packages/basemap/pyproject.toml +++ b/packages/basemap/pyproject.toml @@ -2,7 +2,8 @@ requires = [ 'setuptools', 'wheel', - 'numpy == 2.0.0', 'cython >= 0.29.31, < 3.1', + 'numpy == 2.1.0; python_version == "3.13"', + 'numpy == 2.0.0; python_version <= "3.12"', ] build-backend = "setuptools.build_meta" From d80b7a889fe5709c13cc7094add2b5b329719561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Mon, 24 Feb 2025 22:14:10 +0100 Subject: [PATCH 4/5] Fix setuptools and wheel build dependency pins --- packages/basemap/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/basemap/pyproject.toml b/packages/basemap/pyproject.toml index 48161aea..a7d90068 100644 --- a/packages/basemap/pyproject.toml +++ b/packages/basemap/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ - 'setuptools', - 'wheel', + 'setuptools >= 67.0, < 76.0', + 'wheel >= 0.40, < 0.46', 'cython >= 0.29.31, < 3.1', 'numpy == 2.1.0; python_version == "3.13"', 'numpy == 2.0.0; python_version <= "3.12"', From 312320bc03ac6b41744d57493161b58b29081e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Mon, 24 Feb 2025 23:35:28 +0100 Subject: [PATCH 5/5] Update CHANGELOG --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 539eeb53..353ffba0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,9 @@ https://semver.org/spec/v2.0.0.html ## [Unreleased] ### Added -- Support `numpy` 2.0 (PR [#614] by @cvanelteren, solves issue [#604]). +- Support for Python 3.13 (PR [#619], solves issue [#608]). +- Support for NumPy 2.0 (PR [#614] by @cvanelteren, solves issue + [#604]). ### Changed - **BREAKING CHANGE**: Set Python minimum supported version to 3.9. @@ -1152,10 +1154,14 @@ https://semver.org/spec/v2.0.0.html - Fix glitches in drawing of parallels and meridians. +[#619]: +https://github.com/matplotlib/basemap/pull/619 [#615]: https://github.com/matplotlib/basemap/pull/615 [#614]: https://github.com/matplotlib/basemap/pull/614 +[#608]: +https://github.com/matplotlib/basemap/issues/608 [#604]: https://github.com/matplotlib/basemap/issues/604 [#598]: