From 89b31f84be570b030fa4215284eece10b39f4a68 Mon Sep 17 00:00:00 2001 From: Cris Diaz Date: Wed, 9 Apr 2025 02:53:38 -0400 Subject: [PATCH 1/3] Fix incorrect docstring return order in shiftdata() --- packages/basemap/src/mpl_toolkits/basemap/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py index 3f61c2c4f..075a21275 100644 --- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py +++ b/packages/basemap/src/mpl_toolkits/basemap/__init__.py @@ -4836,10 +4836,10 @@ def shiftdata(self,lonsin,datain=None,lon_0=None,fix_wrap_around=True): [lon_0-180, lon_0+180] range. ================ ====================================================== - if datain given, returns ``dataout,lonsout`` (data and longitudes shifted to fit in interval - [lon_0-180,lon_0+180]), otherwise just returns longitudes. If - transformed longitudes lie outside map projection region, data is - masked and longitudes are set to 1.e30. + If datain is given, returns ``lonsout, dataout`` (longitudes and data shifted to fit in the interval +[lon_0-180, lon_0+180]); otherwise, returns just the shifted longitudes. If +transformed longitudes lie outside the map projection region, data is +masked and longitudes are set to 1.e30. """ if lon_0 is None and 'lon_0' not in self.projparams: raise ValueError('lon_0 keyword must be provided') From 3acfbc78408bc9a5a2aa05c83b7d1d52245c2ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 12 Jun 2025 21:47:28 +0200 Subject: [PATCH 2/3] Fix docstring indentation after content fix --- packages/basemap/src/mpl_toolkits/basemap/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/basemap/src/mpl_toolkits/basemap/__init__.py b/packages/basemap/src/mpl_toolkits/basemap/__init__.py index 075a21275..673cb28ab 100644 --- a/packages/basemap/src/mpl_toolkits/basemap/__init__.py +++ b/packages/basemap/src/mpl_toolkits/basemap/__init__.py @@ -4836,10 +4836,11 @@ def shiftdata(self,lonsin,datain=None,lon_0=None,fix_wrap_around=True): [lon_0-180, lon_0+180] range. ================ ====================================================== - If datain is given, returns ``lonsout, dataout`` (longitudes and data shifted to fit in the interval -[lon_0-180, lon_0+180]); otherwise, returns just the shifted longitudes. If -transformed longitudes lie outside the map projection region, data is -masked and longitudes are set to 1.e30. + If datain is given, returns ``lonsout, dataout`` (longitudes and data + shifted to fit in the interval [lon_0-180, lon_0+180]); otherwise, + returns just the shifted longitudes. If transformed longitudes lie + outside the map projection region, data is masked and longitudes are + set to 1.e30. """ if lon_0 is None and 'lon_0' not in self.projparams: raise ValueError('lon_0 keyword must be provided') From ed018c718539e8427f59c44e7e43f67d71fe9974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Thu, 12 Jun 2025 21:53:36 +0200 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa768063f..4d8763fd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,8 @@ https://semver.org/spec/v2.0.0.html ### 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 `bdist_wheel.universal` option when building wheels. @@ -1157,6 +1159,8 @@ https://semver.org/spec/v2.0.0.html - Fix glitches in drawing of parallels and meridians. +[#624]: +https://github.com/matplotlib/basemap/pull/624 [#623]: https://github.com/matplotlib/basemap/pull/623 [#622]: @@ -1177,6 +1181,8 @@ https://github.com/matplotlib/basemap/pull/614 https://github.com/matplotlib/basemap/issues/608 [#604]: https://github.com/matplotlib/basemap/issues/604 +[#599]: +https://github.com/matplotlib/basemap/issues/599 [#598]: https://github.com/matplotlib/basemap/pull/598 [#595]: