From 72a6123e6ab06557f08080c14acd80a84d0b7f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 4 May 2023 13:47:08 +0200 Subject: [PATCH 1/8] Upgrade upper pin for numpy to 1.25 --- CHANGELOG.md | 9 ++++++++- packages/basemap/requirements.txt | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 604b0656e..6aebb5314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ https://keepachangelog.com/en/1.0.0/ https://semver.org/spec/v2.0.0.html +## [1.3.7] - 2023-05-04 + +### Changed +- Upgrade `numpy` upper pin to 1.25. + ## [1.3.6] - 2022-10-31 ### Added @@ -1040,7 +1045,9 @@ https://github.com/matplotlib/basemap/issues/228 https://github.com/matplotlib/basemap/issues/179 [Unreleased]: -https://github.com/matplotlib/basemap/compare/v1.3.6...develop +https://github.com/matplotlib/basemap/compare/v1.3.7...develop +[1.3.7]: +https://github.com/matplotlib/basemap/compare/v1.3.6...v1.3.7 [1.3.6]: https://github.com/matplotlib/basemap/compare/v1.3.5...v1.3.6 [1.3.5]: diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt index 91fbe93b7..76af69cf3 100644 --- a/packages/basemap/requirements.txt +++ b/packages/basemap/requirements.txt @@ -8,7 +8,7 @@ numpy >= 1.15, < 1.17; python_version == "3.4" numpy >= 1.16, < 1.19; python_version == "3.5" numpy >= 1.19, < 1.20; python_version == "3.6" numpy >= 1.21, < 1.22; python_version == "3.7" -numpy >= 1.22, < 1.24; python_version >= "3.8" +numpy >= 1.22, < 1.25; python_version >= "3.8" cycler < 0.11; python_version == "3.2" pyparsing >= 1.5, < 2.4.1; python_version == "2.6" From 291a706c15419458c58319614d7f96aa3d9c35f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 4 May 2023 13:48:28 +0200 Subject: [PATCH 2/8] Upgrade upper pin for matplotlib to 3.8 --- CHANGELOG.md | 1 + packages/basemap/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aebb5314..af6d04720 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ https://semver.org/spec/v2.0.0.html ### Changed - Upgrade `numpy` upper pin to 1.25. +- Upgrade `matplotlib` upper pin to 3.8. ## [1.3.6] - 2022-10-31 diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt index 76af69cf3..661d7131e 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.7; python_version >= "3.5" +matplotlib >= 1.5, < 3.8; python_version >= "3.5" pyproj >= 1.9.3, < 2.1.0; python_version == "2.6" pyproj >= 1.9.3, < 2.3.0; python_version == "2.7" From e57d62a0fec0a6d2dff8f7279bcacaea36243430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 4 May 2023 13:49:10 +0200 Subject: [PATCH 3/8] Upgrade upper pin for pyproj to 3.6 --- CHANGELOG.md | 1 + packages/basemap/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af6d04720..4c660f7ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ https://semver.org/spec/v2.0.0.html ### Changed - Upgrade `numpy` upper pin to 1.25. - Upgrade `matplotlib` upper pin to 3.8. +- Upgrade `pyproj` upper pin to 3.6. ## [1.3.6] - 2022-10-31 diff --git a/packages/basemap/requirements.txt b/packages/basemap/requirements.txt index 661d7131e..5b4211b89 100644 --- a/packages/basemap/requirements.txt +++ b/packages/basemap/requirements.txt @@ -25,7 +25,7 @@ pyproj >= 1.9.3, < 2.3.0; python_version == "2.7" pyproj >= 1.9.3, < 1.9.6; python_version == "3.2" pyproj >= 1.9.3, < 2.1.0; python_version == "3.3" pyproj >= 1.9.3, < 2.1.0; python_version == "3.4" -pyproj >= 1.9.3, < 3.5.0; python_version >= "3.5" +pyproj >= 1.9.3, < 3.6.0; python_version >= "3.5" pyshp >= 1.2, < 2.0; python_version == "2.6" pyshp >= 1.2, < 2.4; python_version >= "2.7" From 783a7c8eef632cb7adddb16b90b9854cf46f625c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 4 May 2023 13:50:44 +0200 Subject: [PATCH 4/8] Update CHANGELOG --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c660f7ec..f51c1cb0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ https://semver.org/spec/v2.0.0.html ### Changed - Upgrade `numpy` upper pin to 1.25. -- Upgrade `matplotlib` upper pin to 3.8. +- Upgrade `matplotlib` upper pin to 3.8 (solves issue [#573]). - Upgrade `pyproj` upper pin to 3.6. ## [1.3.6] - 2022-10-31 @@ -955,6 +955,8 @@ https://semver.org/spec/v2.0.0.html - Fix glitches in drawing of parallels and meridians. +[#573]: +https://github.com/matplotlib/basemap/issues/573 [#564]: https://github.com/matplotlib/basemap/pull/564 [#563]: From 3c7284242780051d3c93b30dfc5776f19d41824d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 4 May 2023 14:30:34 +0200 Subject: [PATCH 5/8] Add temporary fix for apt repositories in manylinux workflow --- .github/workflows/basemap-for-manylinux.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/basemap-for-manylinux.yml b/.github/workflows/basemap-for-manylinux.yml index 85f1bbff5..7684d139f 100644 --- a/.github/workflows/basemap-for-manylinux.yml +++ b/.github/workflows/basemap-for-manylinux.yml @@ -223,6 +223,10 @@ jobs: with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist + - + name: Fix APT sources + run: | + sed -i 's|deb\.debian\.org|archive\.debian\.org|g' /etc/apt/sources.list - name: Install auditwheel run: | @@ -268,6 +272,10 @@ jobs: with: name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }} path: ${{ env.PKGDIR }}/dist + - + name: Fix APT sources + run: | + sed -i 's|deb\.debian\.org|archive\.debian\.org|g' /etc/apt/sources.list - name: Install numpy from source run: | From d2fd4eb12e3825e7eb1ff017e3c2d2074192fb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 4 May 2023 14:33:58 +0200 Subject: [PATCH 6/8] Upgrade upper pin for netCDF4 to 1.7 --- CHANGELOG.md | 1 + packages/basemap/requirements-test.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f51c1cb0f..b8b6bc3a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ https://semver.org/spec/v2.0.0.html - Upgrade `numpy` upper pin to 1.25. - Upgrade `matplotlib` upper pin to 3.8 (solves issue [#573]). - Upgrade `pyproj` upper pin to 3.6. +- Upgrade test dependency `netCDF4` upper pin to 1.7. ## [1.3.6] - 2022-10-31 diff --git a/packages/basemap/requirements-test.txt b/packages/basemap/requirements-test.txt index 6d37070de..03499f24f 100644 --- a/packages/basemap/requirements-test.txt +++ b/packages/basemap/requirements-test.txt @@ -19,7 +19,7 @@ pytest-cov >= 2.5, < 3.1; python_version >= "3.5" ordereddict; python_version == "2.6" netCDF4 >= 1.3, < 1.4; python_version < "3.6" -netCDF4 >= 1.3, < 1.5.6; python_version >= "3.6" +netCDF4 >= 1.3, < 1.7; python_version >= "3.6" pillow >= 3.4.0, < 4.0.0; python_version == "2.6" pillow >= 6.2.2, < 7.0.0; python_version == "2.7" From 22c5235979b61d83e3ac8a9fe870cd0a570125f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 4 May 2023 14:35:20 +0200 Subject: [PATCH 7/8] Upgrade lower pin for pillow to 9.4 --- CHANGELOG.md | 1 + packages/basemap/requirements-test.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8b6bc3a0..1dd04705e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ https://semver.org/spec/v2.0.0.html - Upgrade `matplotlib` upper pin to 3.8 (solves issue [#573]). - Upgrade `pyproj` upper pin to 3.6. - Upgrade test dependency `netCDF4` upper pin to 1.7. +- Upgrade test dependency `pillow` lower pin to 9.4. ## [1.3.6] - 2022-10-31 diff --git a/packages/basemap/requirements-test.txt b/packages/basemap/requirements-test.txt index 03499f24f..1e4659b6a 100644 --- a/packages/basemap/requirements-test.txt +++ b/packages/basemap/requirements-test.txt @@ -28,4 +28,4 @@ pillow >= 4.3.0, < 5.0.0; python_version == "3.3" pillow >= 5.4.0, < 6.0.0; python_version == "3.4" pillow >= 7.1.0, < 8.0.0; python_version == "3.5" pillow >= 8.3.2, < 9.0.0; python_version == "3.6" -pillow >= 9.0.1, < 10.0.0; python_version >= "3.7" +pillow >= 9.4.0, < 10.0.0; python_version >= "3.7" From 594a51962bb409e12ab25f8346058ff7daf0710e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 4 May 2023 15:15:10 +0200 Subject: [PATCH 8/8] Bump version to 1.3.7 --- packages/basemap/README.md | 4 ++-- packages/basemap/setup.py | 2 +- packages/basemap/src/mpl_toolkits/basemap/__init__.py | 2 +- packages/basemap/src/mpl_toolkits/basemap/proj.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/basemap/README.md b/packages/basemap/README.md index 1e5efd8ca..4b408b7a0 100644 --- a/packages/basemap/README.md +++ b/packages/basemap/README.md @@ -45,6 +45,6 @@ https://spdx.org/licenses/LGPL-2.1-only.html https://spdx.org/licenses/MIT.html [`LICENSE`]: -https://github.com/matplotlib/basemap/blob/v1.3.3/packages/basemap/LICENSE +https://github.com/matplotlib/basemap/blob/v1.3.7/packages/basemap/LICENSE [`LICENSE.geos`]: -https://github.com/matplotlib/basemap/blob/v1.3.3/packages/basemap/LICENSE.geos +https://github.com/matplotlib/basemap/blob/v1.3.7/packages/basemap/LICENSE.geos diff --git a/packages/basemap/setup.py b/packages/basemap/setup.py index 43698876c..69b23963c 100644 --- a/packages/basemap/setup.py +++ b/packages/basemap/setup.py @@ -172,7 +172,7 @@ def run(self): "name": "basemap", "version": - "1.3.6", + "1.3.7", "license": "MIT", "description": diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py index 8f5022c86..f09e16f42 100644 --- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py +++ b/packages/basemap/src/mpl_toolkits/basemap/__init__.py @@ -54,7 +54,7 @@ import functools -__version__ = "1.3.6" +__version__ = "1.3.7" # basemap data files now installed in lib/matplotlib/toolkits/basemap/data # check to see if environment variable BASEMAPDATA set to a directory, diff --git a/packages/basemap/src/mpl_toolkits/basemap/proj.py b/packages/basemap/src/mpl_toolkits/basemap/proj.py index 9a56dacc8..7c733bbb4 100644 --- a/packages/basemap/src/mpl_toolkits/basemap/proj.py +++ b/packages/basemap/src/mpl_toolkits/basemap/proj.py @@ -11,7 +11,7 @@ from matplotlib.cbook import dedent -__version__ = "1.3.6" +__version__ = "1.3.7" _dg2rad = math.radians(1.) _rad2dg = math.degrees(1.)