Update to 0.7.0

No python3 in EPEL
2015-06-24 14:48:17 -06:00 · 2015-06-24 14:33:15 -06:00
3 changed files with 97 additions and 200 deletions
--- a/0001-Fix-doc-build-with-Sphinx-6.patch
+++ b/0001-Fix-doc-build-with-Sphinx-6.patch
@@ -1,26 +0,0 @@
-From 00f39d74f8788ad5aa0dbfe34e7b66b38d0c63d1 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Mon, 8 May 2023 00:05:59 -0400
-Subject: [PATCH] Fix doc build with Sphinx 6
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
- doc/source/conf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 7efdfd8..ab40673 100644
--- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -226,7 +226,7 @@ latex_documents = [
- # If false, no module index is generated.
- # latex_use_modindex = True
- 
-extlinks = {"issue": ("https://github.com/pydata/bottleneck/issues/%s", "#")}
-+extlinks = {"issue": ("https://github.com/pydata/bottleneck/issues/%s", "#%s")}
- intersphinx_mapping = {
-     "numpy": ("https://docs.scipy.org/doc/numpy/", None),
-     "numpydoc": ("https://numpydoc.readthedocs.io/en/latest/", None),
-- 
-2.40.0
-
--- a/python-Bottleneck.spec
+++ b/python-Bottleneck.spec
@@ -1,17 +1,36 @@
+%global __provides_exclude_from ^%{python_sitearch}/.*\\.so
 %global upname Bottleneck

+%if 0%{?fedora}
+%global with_python3
+%endif
+
 Name:		python-%{upname}
-Version:	1.3.7
-Release:	5%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 Summary:	Collection of fast NumPy array functions written in Cython

 License:	BSD
-URL:		https://pypi.org/project/Bottleneck/
-Source0:	https://files.pythonhosted.org/packages/source/B/%{upname}/%{upname}-%{version}.tar.gz
-# https://github.com/pydata/bottleneck/pull/432
-Patch0001:	0001-Fix-doc-build-with-Sphinx-6.patch
+URL:		http://berkeleyanalytics.com/bottleneck
+Source0:	https://pypi.python.org/packages/source/B/%{upname}/%{upname}-%{version}.tar.gz

-BuildRequires:	gcc
+BuildRequires:	numpy
+BuildRequires:	python-nose
+BuildRequires:	python-numpydoc
+BuildRequires:	python-setuptools
+BuildRequires:	python-sphinx
+BuildRequires:	python2-devel
+%if 0%{?with_python3}
+BuildRequires:	python3-devel
+BuildRequires:	python3-nose
+BuildRequires:	python3-numpy
+BuildRequires:	python3-scipy
+BuildRequires:	python3-setuptools
+%endif
+BuildRequires:	scipy
+
+Requires:	numpy%{?_isa}
+Requires:	scipy%{?_isa}

 %description
 %{name} is a collection of fast NumPy array functions
@@ -22,211 +41,115 @@ written in Cython.
 Summary:	Documentation files for %{name}

 BuildArch:	noarch
+%if 0%{?with_python3}
+Provides:	python3-%{upname}-doc = %{version}-%{release}
+%endif

 %description doc
 This package contains the HTML-docs for %{name}.


+%if 0%{?with_python3}
 %package -n python3-%{upname}
 Summary:	Collection of fast NumPy array functions written in Cython

-BuildRequires:	python3-devel
-BuildRequires:	python3-pytest
-BuildRequires:	python3-numpy
-BuildRequires:	python3-numpydoc
-BuildRequires:	python3-scipy
-BuildRequires:	python3-setuptools
-BuildRequires:	python3-sphinx
-
 Requires:	python3-numpy%{?_isa}
 Requires:	python3-scipy%{?_isa}

-%{?python_provide:%python_provide python3-%{upname}}
-
 %description -n python3-%{upname}
 python3-%{upname} is a collection of fast NumPy array functions
 written in Cython.
+%endif


 %prep
-%autosetup -n %{upname}-%{version} -p 1
-rm -fr .egg* *.egg*
+%setup -qn %{upname}-%{version}
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif

-# use numpydoc from the package instead
-rm -f doc/sphinxext/numpydoc.py*
-
-# Python 2 remark
-sed -i 's/fid = file(/fid = open(/' doc/source/conf.py
-
-# Remove the contributors extensions which can't work because we don't
-# have a repo anyway.
-sed -i /contributors/d doc/source/conf.py

 %build
-%py3_build
+# export compiler-flags
+%configure ||:
+
+# build
+%{__python} setup.py build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif
+
+# build autodocs
+export PYTHONPATH="`pwd`/`find . -depth -type d -name lib.linux*`"
+pushd doc
+mkdir -p source/_static
+make html
+
+# clean unneeded stuff from docs
+rm -rf build/html/.buildinfo \
+	build/html/_sources


 %install
-%py3_install
+%{__python} setup.py install -O1 --skip-build --root `pwd`/test_install

 # clean unneeded stuff
-rm -rf %{buildroot}%{python3_sitearch}/bottleneck/LICENSE
+rm -rf test_install/%{python_sitearch}/bottleneck/src \
+	test_install/%{python_sitearch}/bottleneck/LICENSE
+
+# install into buildroot
+cp -a test_install/* %{buildroot}
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root `pwd`/test_install
+
+# clean unneeded stuff
+rm -rf test_install/%{python3_sitearch}/bottleneck/src \
+	test_install/%{python3_sitearch}/bottleneck/LICENSE
+
+# install into buildroot
+cp -a test_install/* %{buildroot}
+popd
+%endif

 %{_fixperms} %{buildroot}/*

-# Build the autodocs.
-export PYTHONPATH="%{buildroot}%{python3_sitearch}"
-export READTHEDOCS=1
-sphinx-build -b html doc/source doc/html
-
-# Clean unneeded stuff from docs.
-rm -rf doc/html/{.buildinfo,.doctrees}
-

 %check
-pushd %{buildroot}%{python3_sitearch}
-pytest-%{python3_version} bottleneck -v
+pushd `find . -depth -type d -name lib.linux*`
+%{__python} -c 'import bottleneck as bn; bn.test()'
 popd
-rm -rf %{buildroot}%{python3_sitearch}/.pytest_cache
+%if 0%{?with_python3}
+pushd `find %{py3dir} -depth -type d -name lib.linux*`
+%{__python3} -c 'import bottleneck as bn; bn.test()'
+popd
+%endif
+
+
+%files
+%doc bottleneck/LICENSE
+%{python_sitearch}/*

 %files doc
-%license LICENSE
-%doc README* RELEASE* doc/html
-
+%doc README* RELEASE* bottleneck/LICENSE doc/build/html

+%if 0%{?with_python3}
 %files -n python3-%{upname}
-%license LICENSE
-%doc README* RELEASE*
-%{python3_sitearch}/bottleneck
-%{python3_sitearch}/%{upname}-%{version}-py%{python3_version}.egg-info
+%doc bottleneck/LICENSE
+%{python3_sitearch}/*
+%endif


 %changelog
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Wed Jun 24 2015 Orion Poplawski <orion@cora.nwra.com> - 0.7.0-1
+- Update to 0.7.0

-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 28 2023 Python Maint <python-maint@redhat.com> - 1.3.7-2
- Rebuilt for Python 3.12
-
-* Tue Apr 04 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.3.7-1
- Update to 1.3.7
-Fixes: rhbz#2056294
-Fixes: rhbz#2137289
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 1.3.2-4
- Rebuilt for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 17 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.2-1
- Update to latest version (#1768152)
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.2.1-18
- Rebuilt for Python 3.10
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-15
- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Oct  4 2019 Orion Poplawski <orion@nwra.com> - 1.2.1-13
- Fix URL
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-12
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-11
- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 28 2019 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-9
- Subpackage python2-Bottleneck has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-6
- Rebuilt for Python 3.7
- Use numpydoc from our package to fix FTBFS (#1594555)
-
-* Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.2.1-5
- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue May 16 2017 Björn Esser <besser82@fedoraproject.org> - 1.2.1-1
- Updated to new upstream release (rhbz#1451146)
-
-* Sun Apr 09 2017 Björn Esser <besser82@fedoraproject.org> - 1.2.0-1
- Updated to new upstream release (rhbz#1105817)
- Updated spec-file to recent guidelines
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-10
- Rebuild for Python 3.6
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-9
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sun Nov 15 2015 Thomas Spura <tomspur@fedoraproject.org> - 0.6.0-7
- Use new python macros and add python2 subpackage
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-6
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue May 27 2014 Kalev Lember <kalevlember@gmail.com> - 0.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+* Wed Jun 24 2015 Orion Poplawski <orion@cora.nwra.com> - 0.6.0-2
+- No python3 in EPEL

 * Wed Aug 21 2013 Björn Esser <bjoern.esser@gmail.com> - 0.6.0-1
 - Initial rpm release (#999563)
--- a/2
+++ b/2
@@ -1 +1 @@
-SHA512 (Bottleneck-1.3.7.tar.gz) = ffeacb13e5a99db85e1580b9f2ead98239b4fd0b253a3c242a5507a026b439b9927ea49becec7e4d2d8f8e4ced15f43514c0af99379389db141ae50c4513e011
+d9e346919654896d67e304ee0202d628  Bottleneck-0.7.0.tar.gz
Author	SHA1	Message	Date
Orion Poplawski	3584ed06de	Update to 0.7.0	2015-06-24 14:48:17 -06:00
Orion Poplawski	fab35c0efd	No python3 in EPEL	2015-06-24 14:33:15 -06:00