Update to 1.6.1

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -13,3 +13,19 @@
 /netcdf4-python-1.2.5.tar.gz
 /netcdf4-python-1.2.6.tar.gz
 /netcdf4-python-1.2.7.tar.gz
+/netcdf4-python-1.2.9.tar.gz
+/netcdf4-python-1.3.1.tar.gz
+/netcdf4-python-1.4.1.tar.gz
+/netcdf4-python-1.4.3.2.tar.gz
+/netcdf4-python-1.5.0.1.tar.gz
+/netcdf4-python-1.5.1.tar.gz
+/netcdf4-python-1.5.1.2.tar.gz
+/netcdf4-python-1.5.2.tar.gz
+/netcdf4-python-1.5.3.tar.gz
+/netcdf4-python-1.5.4.tar.gz
+/netcdf4-python-1.5.5.1.tar.gz
+/netcdf4-python-1.5.6.tar.gz
+/netcdf4-python-1.5.7.tar.gz
+/netcdf4-python-1.5.8.tar.gz
+/netcdf4-python-1.6.0.tar.gz
+/netcdf4-python-1.6.1.tar.gz

netcdf4-python-libs.patch

@@ -1,12 +0,0 @@
-diff -up netcdf4-python-1.2.5rel/setup.py.libs netcdf4-python-1.2.5rel/setup.py
---- netcdf4-python-1.2.5rel/setup.py.libs	2016-11-29 10:55:40.518989615 -0700
-+++ netcdf4-python-1.2.5rel/setup.py	2016-11-29 10:55:40.520989604 -0700
-@@ -324,7 +324,7 @@ NETCDF4_DIR environment variable not set
-     if sys.platform=='win32':
-         libs = ['netcdf','hdf5_hl','hdf5','zlib']
-     else:
--        libs = ['netcdf','hdf5_hl','hdf5','z']
-+        libs = ['netcdf']
-     if netCDF4_libdir is not None: lib_dirs=[netCDF4_libdir]
-     if HDF5_libdir is not None: lib_dirs.append(HDF5_libdir)
-     if netCDF4_incdir is not None: inc_dirs=[netCDF4_incdir]

netcdf4-python-norpath.patch

@@ -1,23 +1,12 @@
-diff -up netcdf4-python-1.2.5rel/setup.py.norpath netcdf4-python-1.2.5rel/setup.py
---- netcdf4-python-1.2.5rel/setup.py.norpath	2016-11-29 10:53:45.214631966 -0700
-+++ netcdf4-python-1.2.5rel/setup.py	2016-11-29 10:55:20.014103847 -0700
-@@ -399,8 +399,7 @@ if has_cython and 'sdist' not in sys.arg
-                             [netcdf4_src_root + '.pyx'],
-                             libraries=libs,
-                             library_dirs=lib_dirs,
--                            include_dirs=inc_dirs,
--                            runtime_library_dirs=runtime_lib_dirs),
-+                            include_dirs=inc_dirs),
-                   Extension('netcdftime._netcdftime', ['netcdftime/_netcdftime.pyx'])]
-     # remove netCDF4.c file if it exists, so cython will recompile netCDF4.pyx.
-     # run for build *and* install (issue #263). Otherwise 'pip install' will
-@@ -442,8 +441,7 @@ else:
-                             [netcdf4_src_c],
-                             libraries=libs,
-                             library_dirs=lib_dirs,
--                            include_dirs=inc_dirs,
--                            runtime_library_dirs=runtime_lib_dirs),
-+                            include_dirs=inc_dirs),
-                   Extension('netcdftime._netcdftime', ['netcdftime/_netcdftime.c'])]
-     ext_modules = extensions
+diff -up netcdf4-python-1.5.8rel/setup.py.norpath netcdf4-python-1.5.8rel/setup.py
+--- netcdf4-python-1.5.8rel/setup.py.norpath	2021-10-31 07:25:17.000000000 -0600
++++ netcdf4-python-1.5.8rel/setup.py	2022-01-19 19:37:47.204865578 -0700
+@@ -493,7 +493,7 @@ NETCDF4_DIR environment variable not set
+ if sys.platform == 'win32':
+     runtime_lib_dirs = []
+ else:
+-    runtime_lib_dirs = lib_dirs
++    runtime_lib_dirs = []
  
+ # Do not require numpy for just querying the package
+ # Taken from the h5py setup file.

netcdf4-python.spec

@@ -1,34 +1,37 @@
 Name:           netcdf4-python
-Version:        1.2.7
-Release:        3%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        Python/numpy interface to netCDF
 
-Group:          Development/Languages
 License:        MIT
 URL:            https://github.com/Unidata/netcdf4-python
 Source0:        https://github.com/Unidata/netcdf4-python/archive/v%{version}rel/%{name}-%{version}.tar.gz
 # No rpath for library
 # http://code.google.com/p/netcdf4-python/issues/detail?id=138
 Patch0:         netcdf4-python-norpath.patch
-# Don't link against hdf5 and z libraries
-# http://code.google.com/p/netcdf4-python/issues/detail?id=139
-Patch1:         netcdf4-python-libs.patch
 
+%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 BuildRequires:  python2-devel
-BuildRequires:  Cython
-BuildRequires:  python-dateutil
+BuildRequires:  python2-setuptools >= 18.0
+# Added in 1.4.0
+#BuildRequires:  python2-cftime
+BuildRequires:  python2-Cython
+BuildRequires:  python2-dateutil
 # EL6 has python 2.6 and needs ordereddict
 %if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:  python-ordereddict
 %endif
-BuildRequires:  numpy
+BuildRequires:  python2-numpy
+%endif
 BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools >= 18
+BuildRequires:  python%{python3_pkgversion}-cftime
 BuildRequires:  python%{python3_pkgversion}-Cython
 BuildRequires:  python%{python3_pkgversion}-dateutil
 BuildRequires:  python%{python3_pkgversion}-numpy
 BuildRequires:  netcdf-devel
 # python3 is default in fedora, but not EPEL
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires:       python%{python3_pkgversion}-netcdf4 = %{version}-%{release}
 %else
 Requires:       python2-netcdf4 = %{version}-%{release}
@@ -51,13 +54,15 @@ containing vlens, and vlens containing compound types) are not supported.
 
 %package -n python2-netcdf4
 Summary:        Python/numpy interface to netCDF
-Group:          Development/Languages
 # EL6 has python 2.6 and needs ordereddict
 %if 0%{?rhel} && 0%{?rhel} <= 6
 Requires:       python-ordereddict
 %endif
-Requires:       Cython
-Requires:       numpy
+# Added in 1.4.0
+#Requires:       python2-cftime
+Requires:       python2-Cython
+Requires:       python2-numpy
+%{?python_provide:%python_provide python2-netcdf4}
 Provides:       netcdf4-python2 = %{version}-%{release}
 
 %description -n python2-netcdf4
@@ -77,9 +82,10 @@ containing vlens, and vlens containing compound types) are not supported.
 
 %package -n python%{python3_pkgversion}-netcdf4
 Summary:        Python/numpy interface to netCDF
-Group:          Development/Languages
+Requires:       python%{python3_pkgversion}-cftime
 Requires:       python%{python3_pkgversion}-Cython
 Requires:       python%{python3_pkgversion}-numpy
+%{?python_provide:%python_provide python%{python3_pkgversion}-netcdf4}
 Obsoletes:      netcdf4-python%{python3_pkgversion} < 1.2.7-3
 Provides:       netcdf4-python%{python3_pkgversion} = %{version}-%{release}
 
@@ -101,20 +107,24 @@ containing vlens, and vlens containing compound types) are not supported.
 %prep
 %setup -q -n %{name}-%{version}rel
 %patch0 -p1 -b .norpath
-%patch1 -p1 -b .libs
-# This uses the network
-rm test/tst_dap.py
 
 
 %build
+# Set to get libs from ncconfig to avoid directly linking to -lhdf5
+export USE_NCCONFIG=1
+%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 %py2_build
+%endif
+
 %py3_build
 
 
 %install
-# python3 is default in fedora, but not EPEL
-%if 0%{?fedora}
+# python3 is default in fedora, but not EPEL7
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 %py2_install
+%endif
 %py3_install
 %else
 %py3_install
@@ -124,28 +134,155 @@ rm test/tst_dap.py
  
 %check
 cd test
+export NO_NET=1
+%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 PYTHONPATH=$(echo ../build/lib.*%{python2_version}) %{__python2} run_all.py
-PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
+%endif
+%ifarch s390x
+# FAIL: runTest (tst_compoundvar.VariablesTestCase) -> assert (cmptype4 == dtype4a) # data type should be aligned
+PYTHONPATH=$(echo ../build/lib.linux-*) %{__python3} run_all.py || :
+%else
+PYTHONPATH=$(echo ../build/lib.linux-*) %{__python3} run_all.py
+%endif
 
 
 %files
-%license COPYING
+%license LICENSE
 %{_bindir}/nc3tonc4
 %{_bindir}/nc4tonc3
 %{_bindir}/ncinfo
 
+%if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 %files -n python2-netcdf4
-%license COPYING
+%license LICENSE
 %doc Changelog docs examples README.md
 %{python2_sitearch}/*
+%endif
 
 %files -n python%{python3_pkgversion}-netcdf4
-%license COPYING
+%license LICENSE
 %doc Changelog docs examples README.md
 %{python3_sitearch}/*
 
 
 %changelog
+* Fri Sep 23 2022 Orion Poplawski <orion@nwra.com> - 1.6.1-1
+- Update to 1.6.1
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jun 26 2022 Orion Poplawski <orion@nwra.com> - 1.6.0-1
+- Update to 1.6.0
+
+* Mon Jun 20 2022 Charalampos Stratakis <cstratak@redhat.com> - 1.5.8-3
+- Fix FTBFS with the latest setuptools
+Resolves: rhbz#2097125
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.5.8-2
+- Rebuilt for Python 3.11
+
+* Thu Jan 20 2022 Orion Poplawski <orion@nwra.com> - 1.5.8-1
+- Update to 1.5.8
+
+* Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 1.5.7-2
+- Rebuild for hdf5 1.12.1
+
+* Mon Aug 30 2021 Orion Poplawski <orion@nwra.com> - 1.5.7-1
+- Update to 1.5.7
+
+* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 1.5.6-4
+- Rebuild for netcdf 4.8.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.5.6-2
+- Rebuilt for Python 3.10
+
+* Sun Feb 14 2021 Orion Poplawski <orion@nwra.com> - 1.5.6-1
+- Update to 1.5.6
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Jan 24 2021 Orion Poplawski <orion@nwra.com> - 1.5.5.1-1
+- Update to 1.5.5.1
+
+* Thu Sep 17 20:16:46 MDT 2020 Orion Poplawski <orion@nwra.com> - 1.5.4-1
+- Update to 1.5.4
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.5.3-3
+- Rebuilt for Python 3.9
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 24 2019 Orion Poplawski <orion@nwra.com> - 1.5.3-1
+- Update to 1.5.3
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.2-2
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Tue Sep 10 2019 Orion Poplawski <orion@nwra.com> - 1.5.2-1
+- Update to 1.5.2
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.1.2-3
+- Rebuilt for Python 3.8
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May  6 2019 Orion Poplawski <orion@nwra.com> - 1.5.1.2-1
+- Update to 1.5.1.2
+
+* Wed May  1 2019 Orion Poplawski <orion@nwra.com> - 1.5.1-1
+- Update to 1.5.1
+
+* Tue Apr  2 2019 Orion Poplawski <orion@nwra.com> - 1.5.0.1-1
+- Update to 1.5.0.1
+
+* Mon Mar 18 2019 Orion Poplawski <orion@nwra.com> - 1.4.3.2-2
+- Rebuild for netcdf 4.6.3
+
+* Sat Mar  9 2019 Orion Poplawski <orion@nwra.com> - 1.4.3.2-1
+- Update to 1.4.3.2
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Oct 7 2018 Orion Poplawski <orion@nwra.com> - 1.3.1-1
+- Update to 1.3.1
+- Drop Python 2 in Fedora (bugz #1634978)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.2.9-6
+- Rebuilt for Python 3.7
+
+* Tue Mar 13 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.2.9-5
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 20 2017 Orion Poplawski <orion@cora.nwra.com> - 1.2.9-1
+- Update to 1.2.9
+
+* Tue Mar 7 2017 Orion Poplawski <orion@cora.nwra.com> - 1.2-7-4
+- Provide python-netcdf4
+
 * Thu Mar 2 2017 Orion Poplawski <orion@cora.nwra.com> - 1.2-7-3
 - Move python libraries into python?- sub-packages
 - Make python3 default for Fedora

sources

@@ -1 +1 @@
-SHA512 (netcdf4-python-1.2.7.tar.gz) = e41fa947bec47e34b5e0051cd27df934eba4bc7abe07b94fb77645269e68fe18e5d82fa8bd18ec99418c94aa9f9abf614298bf8376bd773695941a08de7e7ede
+SHA512 (netcdf4-python-1.6.1.tar.gz) = 867fc264df7d2151cf3a684bd6f0f0c1e1efd48c3cae4c2c0f529697f3c2235c8bc87e859f88209ba59e33793a81899a12a794e5ca1522fa53cebf348592f022