diff --git a/.gitignore b/.gitignore index 057f566..240d140 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pyshtools-4.6.2.tar.gz /pyshtools-4.10.tar.gz /pyshtools-4.10.1.tar.gz +/pyshtools-4.10.2.tar.gz diff --git a/0001-Add-default-include-path-for-FFTW.patch b/0001-Add-default-include-path-for-FFTW.patch index dfde650..20584bc 100644 --- a/0001-Add-default-include-path-for-FFTW.patch +++ b/0001-Add-default-include-path-for-FFTW.patch @@ -1,4 +1,4 @@ -From 50ebb45d7a8609b8c73f0bebd69d72c066061bee Mon Sep 17 00:00:00 2001 +From 6a2624514e4a916648da436a0114898eeae48b6e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 8 Aug 2022 16:52:11 -0400 Subject: [PATCH 1/2] Add default include path for FFTW @@ -9,20 +9,20 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index 44e5a628..7d0c38fe 100644 +index ad56ccbf..a1c1b3f6 100644 --- a/setup.py +++ b/setup.py -@@ -28,7 +28,8 @@ from numpy.distutils.command.develop import develop as _develop # noqa: E402 +@@ -32,7 +32,8 @@ from numpy.distutils.command.develop import develop as _develop # noqa: E402 from numpy.distutils.fcompiler import FCompiler # noqa: E402 from numpy.distutils.fcompiler import get_default_fcompiler # noqa: E402 from numpy.distutils.misc_util import Configuration # noqa: E402 -from numpy.distutils.system_info import get_info, dict_append # noqa: E402 +from numpy.distutils.system_info import ( # noqa: E402 + fftw_info, get_info, dict_append) - from subprocess import check_call # noqa: E402 -@@ -200,8 +201,9 @@ def configuration(parent_package='', top_path=None): + CLASSIFIERS = [ +@@ -188,8 +189,9 @@ def configuration(parent_package='', top_path=None): kwargs['f2py_options'] = ['--quiet'] # FFTW info @@ -35,5 +35,5 @@ index 44e5a628..7d0c38fe 100644 if sys.platform != 'win32': kwargs['libraries'].extend(['m']) -- -2.36.1 +2.40.0 diff --git a/0002-Remove-cartopy-build-time-dependencies.patch b/0002-Remove-cartopy-build-time-dependencies.patch index ee434ba..a44eae1 100644 --- a/0002-Remove-cartopy-build-time-dependencies.patch +++ b/0002-Remove-cartopy-build-time-dependencies.patch @@ -1,4 +1,4 @@ -From a190591bcaafc2f8e5f715b9c3845d8d989a7c01 Mon Sep 17 00:00:00 2001 +From c7a74a46b183954e827282ea1374eba935baf35e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 8 Aug 2022 17:48:35 -0400 Subject: [PATCH 2/2] Remove cartopy build-time dependencies @@ -9,18 +9,18 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 7d0c38fe..c7b5ea03 100644 +index a1c1b3f6..1684c09d 100644 --- a/setup.py +++ b/setup.py -@@ -82,7 +82,7 @@ INSTALL_REQUIRES = [ +@@ -70,7 +70,7 @@ INSTALL_REQUIRES = [ ] EXTRAS_REQUIRE = { - 'cartopy': ['cython', 'pyshp', 'six', 'shapely', 'cartopy>=0.18.0'], + 'cartopy': ['cartopy>=0.18.0'], - 'pygmt': ['pygmt==0.3'], + 'pygmt': ['pygmt>=0.3'], 'palettable': ['palettable>=3.3'], 'ducc': ['ducc0>=0.15'] -- -2.36.1 +2.40.0 diff --git a/375.patch b/375.patch deleted file mode 100644 index 4d45e70..0000000 --- a/375.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ce61a4c021b83257c0307aad32e35e9e57f6d8a0 Mon Sep 17 00:00:00 2001 -From: k-dominik -Date: Tue, 7 Mar 2023 07:53:53 +0100 -Subject: [PATCH 1/2] fix import of pkg_resources - -was previously relying on pkg_resources being imported from setuptools. -That broke in -https://github.com/pypa/setuptools/commit/6050634818943befefe3a85a12503b6d8a1e8106 ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 44e5a628..2e843c29 100644 ---- a/setup.py -+++ b/setup.py -@@ -16,6 +16,7 @@ - raise SystemError(error) - - import os # noqa: E402 -+import pkg_resources # noqa: E402 - import sysconfig # noqa: E402 - import setuptools # noqa: E402 - import numpy # noqa: E402 -@@ -150,7 +151,7 @@ def run(self): - - def distutils_dir_name(dname): - """Returns the name of a distutils build directory""" -- parse_version = setuptools.version.pkg_resources.packaging.version.parse -+ parse_version = pkg_resources.packaging.version.parse - if parse_version(setuptools.__version__) < parse_version('62.1.0'): - f = "{dirname}.{platform}-{version[0]}.{version[1]}" - return f.format(dirname=dname, - -From b2453b8b030a8e7a5a7a112d0298ac3092225f51 Mon Sep 17 00:00:00 2001 -From: k-dominik -Date: Tue, 7 Mar 2023 11:38:59 +0100 -Subject: [PATCH 2/2] fix flake8 error E275 in setup.py - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 2e843c29..e4f74d10 100644 ---- a/setup.py -+++ b/setup.py -@@ -42,7 +42,7 @@ - import pypandoc - rst = pypandoc.convert_file('README.md', 'rst') - long_description = rst.split('\n', 5)[5] --except(IOError, ImportError): -+except (IOError, ImportError): - print('*** pypandoc is not installed. PYPI long_description will not be ' - 'formatted correctly. ***') - long_description = open('README.md').read() diff --git a/python-pyshtools.spec b/python-pyshtools.spec index 1d2183b..4f9f21f 100644 --- a/python-pyshtools.spec +++ b/python-pyshtools.spec @@ -7,7 +7,7 @@ %endif Name: python-%{srcname} -Version: 4.10.1 +Version: 4.10.2 Release: %autorelease Summary: Tools for working with spherical harmonics @@ -18,8 +18,6 @@ Source0: %pypi_source Patch: 0001-Add-default-include-path-for-FFTW.patch # We don't need these requirements as Cartopy is already built. Patch: 0002-Remove-cartopy-build-time-dependencies.patch -# Fix build with latest setuptools -Patch: https://github.com/shtools/SHTOOLS/pull/375.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} diff --git a/sources b/sources index 0dc15b9..5e7645f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyshtools-4.10.1.tar.gz) = 152a25f3b4a9042d632d6fbdc25ef0669e5cdecbfa342da24ce4ddd2b148a0a7169bb29c03f1279e8284c538b600c5ddbb3d7e57b53d3c7c820f295c48b3d3e0 +SHA512 (pyshtools-4.10.2.tar.gz) = 8fc3041fd80585ca6d8220e5ddcfa1c410966bc9248d614ae494a01aa749e3df0d4f107001f90fa76f1bb071e50c363e62bc483bffacaebe29a080624bc3a45e