#2 Rebase kombu to 3.0.32 for building celery 3.1.20
Closed 3 years ago by ngompa. Opened 3 years ago by ngompa.
rpms/ ngompa/python-kombu rebase-epel7-to-3.0.32-for-celery  into  epel7

fix changelog date
Fabian Affolter • 7 years ago  
file modified
+14
@@ -16,6 +16,7 @@ 

  /kombu-2.5.13.tar.gz

  /kombu-2.5.14.tar.gz

  /kombu-2.5.15.tar.gz

+ /kombu-2.5.16.tar.gz

  /kombu-3.0.1.tar.gz

  /kombu-3.0.2.tar.gz

  /kombu-3.0.3.tar.gz
@@ -23,3 +24,16 @@ 

  /kombu-3.0.5.tar.gz

  /kombu-3.0.6.tar.gz

  /kombu-3.0.8.tar.gz

+ /kombu-3.0.12.tar.gz

+ /kombu-3.0.14.tar.gz

+ /kombu-3.0.15.tar.gz

+ /kombu-3.0.19.tar.gz

+ /kombu-3.0.20.tar.gz

+ /kombu-3.0.21.tar.gz

+ /kombu-3.0.22.tar.gz

+ /kombu-3.0.23.tar.gz

+ /kombu-3.0.24.tar.gz

+ /kombu-3.0.26.tar.gz

+ /kombu-3.0.28.tar.gz

+ /kombu-3.0.29.tar.gz

+ /kombu-3.0.32.tar.gz

file modified
+133 -78
@@ -1,16 +1,14 @@ 

- %if 0%{?fedora} > 12

+ %if 0%{?fedora}

  %global with_python3 1

- %else

- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}

  %endif

  

  %global srcname kombu

  

  Name:           python-%{srcname}

- Version:        3.0.8

- Release:        2%{?dist}

+ Version:        3.0.32

+ Release:        1%{?dist}

  Epoch:          1

- Summary:        AMQP Messaging Framework for Python

+ Summary:        An AMQP Messaging Framework for Python

  

  Group:          Development/Languages

  # utils/functional.py contains a header that says Python
@@ -21,16 +19,6 @@ 

  

  BuildRequires:  python2-devel

  

- %if 0%{?with_python3}

- BuildRequires:  python3-devel

- BuildRequires:  python3-nose

- BuildRequires:  python3-setuptools

- BuildRequires:  python3-anyjson

- # for python3 tests

- BuildRequires:  python3-mock

- BuildRequires:  python3-nose-cover3

- BuildRequires:  python3-coverage

- %endif # if with_python3

  

  BuildRequires:  python-setuptools

  BuildRequires:  python-nose
@@ -38,28 +26,20 @@ 

  

  # required for tests:

  BuildRequires: python-nose-cover3

- BuildRequires: python-unittest2

  BuildRequires: python-coverage

  BuildRequires: python-mock

  BuildRequires: python-simplejson

  BuildRequires: PyYAML

  BuildRequires: python-msgpack

  BuildRequires: python-amqp

+ BuildRequires: python-pymongo

  

- #%if 0%{?with_python3}

- BuildRequires: python3-amqp

- 

- # tests:

- BuildRequires: python3-nose

- BuildRequires: python3-nose-cover3

- BuildRequires: python3-mock

- #%endif

  

  # For documentation

  #BuildRequires:  pymongo python-sphinx

  #This causes tests error, needs fixing upstream. Incompatible with python > 2.7

  #BuildRequires:  python-couchdb

- Requires: python-amqp >= 1.3.3

+ Requires: python-amqp >= 1.4.5

  Requires: python-anyjson >= 0.3.3

  

  %description
@@ -77,8 +57,22 @@ 

  Summary:        AMQP Messaging Framework for Python3

  Group:          Development/Languages

  

- Requires:       python3

  Requires:       python3-amqp

+ Requires:       python3-anyjson

+ BuildRequires:  python3-devel

+ BuildRequires:  python3-nose

+ BuildRequires:  python3-setuptools

+ BuildRequires:  python3-anyjson

+ BuildRequires:  python3-amqp

+ BuildRequires:  python3-pymongo

+ 

+ # for python3 tests

+ BuildRequires:  python3-mock

+ BuildRequires:  python3-nose-cover3

+ BuildRequires:  python3-coverage

+ BuildRequires:  python3-nose

+ 

+ 

  

  %description -n python3-kombu

  AMQP is the Advanced Message Queuing Protocol, an open standard protocol
@@ -101,7 +95,7 @@ 

  %endif

  

  %build

- %{__python} setup.py build

+ %{__python2} setup.py build

  

  # build python3-kombu

  %if 0%{?with_python3}
@@ -111,103 +105,164 @@ 

  %endif # with_python3

  

  %install

- %{__python} setup.py install --skip-build --root %{buildroot}

+ %{__python2} setup.py install --skip-build --root %{buildroot}

+ ### Note: Probably should rm -rf kombu/tests prior to install instead.

+ #fix non executable test script

+ chmod +x %{buildroot}/%{python2_sitelib}/kombu/tests/test_serialization.py

  

- %if 0%{?with_python3}

- pushd %{py3dir}

- %{__python3} setup.py install --skip-build --root %{buildroot}

- popd

- %endif # with_python3

  

- # Documentation in docs folder is not useful without doing a make

- # Seems to have a circular dependency.  Not building for now

- #cd docs && make html

- #cd - && mv docs/.build/html htmldocs

- #rm -rf docs

- #rm -f htmldocs/.buildinfo

- 

- # sadly, tests don't succeed, yet

- %check

- %{__python} setup.py test

- # tests with py3 are failing currently

  %if 0%{?with_python3}

  pushd %{py3dir}

- %{__python3} setup.py test

+ %{__python3} setup.py install --skip-build --root %{buildroot}

  popd

- %endif # with_python3

+ ### Note: Probably should rm -rf kombu/tests prior to install instead.

+ #fix non executable test script

+ chmod +x %{buildroot}/%{python3_sitelib}/kombu/tests/test_serialization.py

+ sed -i 's!/usr/bin/python$!/usr/bin/python3!' %{buildroot}/%{python3_sitelib}/kombu/tests/test_serialization.py

+ %endif

  

  %files

  %doc AUTHORS Changelog FAQ LICENSE READ* THANKS TODO examples/

- %{python_sitelib}/%{srcname}/

- %{python_sitelib}/%{srcname}*.egg-info

+ %{python2_sitelib}/%{srcname}

+ %{python2_sitelib}/%{srcname}*.egg-info

  

  %if 0%{?with_python3}

  %files -n python3-kombu

  %doc AUTHORS Changelog FAQ LICENSE READ* THANKS TODO examples/

- %{python3_sitelib}/*

- %endif # with_python3

+ %{python3_sitelib}/%{srcname}

+ %{python3_sitelib}/kombu-%{version}-py%{python3_version}.egg-info

+ %endif

  

  %changelog

+ * Tue Dec 22 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 1:3.0.32-1

+ - Upstream 3.0.32 (RHBZ#1289079)

+ - Fix python3 guards

+ - Bugfix for debug log flooding and redis transport

+ 

+ * Wed Dec 02 2015 Matthias Runge <mrunge@redhat.com> - 1:3.0.29-5

+ - add requires: python3-anyjson

+ - minor spec cleanup

+ 

+ * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>

+ - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5

+ 

+ * Mon Nov  9 2015 Toshio Kuratomi <toshio@fedoraproject.org> - - 3.0.29-2

+ - Make it so the python3 subpackage doesn't drag in python2

+ 

+ * Wed Oct 28 2015 Fabian Affolter <mail@fabian-affolter.ch> - 1:3.0.29-1

+ - Update to latest upstream version 3.0.29 (rhbz#1275450)

+ 

+ * Thu Oct 15 2015 Fabian Affolter <mail@fabian-affolter.ch> - 1:3.0.28-1

+ - Update to latest upstream version 3.0.28 (rhbz#1270505)

+ 

+ * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.26-2

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

+ 

+ * Thu May 07 2015 Fabian Affolter <mail@fabian-affolter.ch> - 1:3.0.26-1

+ - Update to latest upstream version 3.0.26 (rhbz#1214720)

+ 

+ * Fri Nov 21 2014 Fabian Affolter <mail@fabian-affolter.ch> - 1:3.0.24-1

+ - Update to latest upstream version 3.0.24 (rhbz#1166402)

+ 

+ * Thu Sep 18 2014 Fabian Affolter <mail@fabian-affolter.ch> - 1:3.0.23-1

+ - Update to latest upstream version 3.0.23 (rhbz#1142995)

+ 

+ * Sun Sep 14 2014 Fabian Affolter <mail@fabian-affolter.ch> - 1:3.0.22-1

+ - Update to latest upstream version 3.0.22 (rhbz#1118674)

+ 

+ * Tue Jul 15 2014 Rahul Sundaram <sundaram@fedoraproject.org> - 1:3.0.21-2

+ - reintroduce adjusted conditions for EPEL

+ - fix permission for a test script

+ 

+ * Sun Jul 13 2014 Rahul Sundaram <sundaram@fedoraproject.org> - 1:3.0.21-1

+ - update to 3.0.21

+ - drop conditionals in spec

+ 

+ * Thu Jul 03 2014 Fabian Affolter <mail@fabian-affolter.ch> - 1:3.0.20-1

+ - Update to latest upstream version 3.0.20 (rhbz#1114337)

+ 

+ * Mon Jun 23 2014 Fabian Affolter <mail@fabian-affolter.ch> - 1:3.0.19-1

+ - Update to latest upstream version 3.0.19 (rhbz#1095266)

+ 

+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.15-4

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

+ 

+ * Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.0.15-3

+ - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4

+ 

+ * Mon May 05 2014 Matthias Runge <mrunge@redhat.com> - 3.0.15-2

+ - fix broken build

+ - have files listed only once

+ 

+ * Thu Apr 17 2014 Fabian Affolter <mail@fabian-affolter.ch> - 3.0.15-1

+ - Update to latest upstream version 3.0.15 (rhbz#1072265)

+ 

+ * Wed Mar 26 2014 Fabian Affolter <mail@fabian-affolter.ch> - 3.0.14-1

+ - update to 3.0.14 (rhbz#1072265)

+ 

+ * Wed Feb 26 2014 Matthias Runge <mrunge@redhat.com> - 3.0.12-1

+ - update to 3.0.12 (rhbz#1052424)

+ 

  * Wed Jan 08 2014 Matthias Runge <mrunge@redhat.com> - 3.0.8-2

- - remove requirements patch, bump epoch to be upgradeable

+ - Remove requirements patch, bump epoch to be upgradeable

  

  * Wed Jan 08 2014 Matthias Runge <mrunge@redhat.com> - 3.0.8-1

- - update to 3.0.8 (rhbz#1037549)

+ - Update to 3.0.8 (rhbz#1037549)

  

  * Fri Nov 22 2013 Matthias Runge <mrunge@redhat.com> - 3.0.6-1

- - update to 3.0.6 and enable tests for py3 as well 

+ - Update to 3.0.6 and enable tests for py3 as well 

  

  * Sun Nov 17 2013 Fabian Affolter <mail@fabian-affolter.ch> - 3.0.5-1

  - Updated to latest upstream version 3.0.5 (rhbz#1024916)

  

  * Sat Nov 16 2013 Fabian Affolter <mail@fabian-affolter.ch> - 3.0.4-1

- - Updated to latest upstream version 3.0.4 (rhbz#1024916)

+ - Update to latest upstream version 3.0.4 (rhbz#1024916)

  

  * Fri Nov 15 2013 Fabian Affolter <mail@fabian-affolter.ch> - 3.0.3-1

- - Updated to latest upstream version 3.0.3 (rhbz#1024916)

+ - Update to latest upstream version 3.0.3 (rhbz#1024916)

  

  * Sun Nov 03 2013 Fabian Affolter <mail@fabian-affolter.ch> - 3.0.2-1

- - Updated to latest upstream version 3.0.2 (rhbz#1024916)

+ - Updatd to latest upstream version 3.0.2 (rhbz#1024916)

  

  * Mon Oct 28 2013 Fabian Affolter <mail@fabian-affolter.ch> - 3.0.1-1

- - Updated to latest upstream version 3.0.1 (rhbz#1019148)

+ - Update to latest upstream version 3.0.1 (rhbz#1019148)

  

  * Mon Oct 14 2013 Matthias Runge <mrunge@redhat.com> - 2.5.15-2

- - enable tests for python2

+ - Enable tests for python2

  

  * Mon Oct 14 2013 Matthias Runge <mrunge@redhat.com> - 2.5.15-1

- - updated to 2.5.15 (rhbz#1016271)

+ - Update to 2.5.15 (rhbz#1016271)

  

  * Sun Aug 25 2013 Fabian Affolter <mail@fabian-affolter.ch> - 2.5.14-1

- - Updated to latest upstream version 2.5.14 (rhbz#1000696)

+ - Update to latest upstream version 2.5.14 (rhbz#1000696)

  

  * Wed Aug 21 2013 Matthias Runge <mrunge@redhat.com> - 2.5.13-1

- - updated to latest upstream version 2.5.13 (rhbz#998104)

+ - Update to latest upstream version 2.5.13 (rhbz#998104)

  

  * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.12-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

  

  * Sat Jun 29 2013 Fabian Affolter <mail@fabian-affolter.ch> - 2.5.12-1

- - Updated to latest upstream version 2.5.12

+ - Update to latest upstream version 2.5.12

  

  * Mon Jun 24 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 2.5.10-2

- - add requires on python-amqp/python3-amqp. resolves rhbz#974684

- - fix rpmlint warnings about macro in comments

+ - Add requires on python-amqp/python3-amqp. resolves rhbz#974684

+ - Fix rpmlint warnings about macro in comments

  

  * Sun Apr 21 2013 Fabian Affolter <mail@fabian-affolter.ch> - 2.5.10-1

- - Updated to latest upstream version 2.5.10

+ - Update to latest upstream version 2.5.10

  

  * Sat Mar 23 2013 Fabian Affolter <mail@fabian-affolter.ch> - 2.5.8-1

- - Updated to latest upstream version 2.5.8

+ - Update to latest upstream version 2.5.8

  

  * Sat Mar 09 2013 Fabian Affolter <mail@fabian-affolter.ch> - 2.5.7-1

- - Updated to latest upstream version 2.5.7

+ - Update to latest upstream version 2.5.7

  

  * Mon Feb 11 2013 Fabian Affolter <mail@fabian-affolter.ch> - 2.5.6-1

- - Updated to latest upstream version 2.5.6

+ - Update to latest upstream version 2.5.6

  

  * Sat Feb 09 2013 Fabian Affolter <mail@fabian-affolter.ch> - 2.5.5-1

- - Updated to latest upstream version 2.5.5

+ - Update to latest upstream version 2.5.5

  

  * Thu Dec 13 2012 Matthias Runge <mrunge@redhat.com> - 2.5.4-1

  - Update to upstream version 2.5.4 (rhbz#886001)
@@ -219,7 +274,7 @@ 

  - Update to latest upstream version 2.4.10

  

  * Tue Nov 06 2012 Matthias Runge <mrunge@redhat.com> - 2.4.8-1

- - update to new upstream version 2.4.8

+ - Update to new upstream version 2.4.8

  

  * Thu Sep 20 2012 Matthias Runge <mrunge@redhat.com> - 2.4.7-1

  - Update to new upstream version 2.4.7
@@ -228,12 +283,12 @@ 

  - Update to new upstream version 2.4.3

  

  * Thu Aug 23 2012 Matthias Runge <mrunge@matthias-runge.de> - 2.4.0-1

- - update to new upstream version 2.4.0

+ - Update to new upstream version 2.4.0

  

  * Fri Aug 03 2012 Matthias Runge <mrunge@matthias-runge.de> - 2.3.2-1

- - update to version 2.3.2

- - enable tests

- - require python2 and/or python3

+ - Update to version 2.3.2

+ - Enable tests

+ - Require python2 and/or python3

  

  * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@@ -242,7 +297,7 @@ 

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

  

  * Fri Jul 15 2011 Rahul Sundaram <sundaram@fedoraproject.org> - 1.1.3-1

- - initial spec.  

- - derived from the one written by Fabian Affolter

- - spec patch from Lakshmi Narasimhan

+ - Initial spec

+ - Derived from the one written by Fabian Affolter

+ - Spec patch from Lakshmi Narasimhan

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- 58fb5e3b4e3d9548893490f80a5ef5c4  kombu-3.0.8.tar.gz

+ 8819aa97abb09f5b27f29e35b8ecaeaf  kombu-3.0.32.tar.gz

As part of the work to introduce Pagure 5.x to EPEL7, I need to introduce celery 3.1.20 into EPEL7.

However, that requires upgrading kombu, and so I've prepared a PR that rebases it to 3.0.32 from Fedora 23.

This puts us just slightly above the version used on pagure.io today, within the same version series.

Thank you for your contribution here.

From looking at bug reports, it seems to be preferrable to rebase to version 4.2 though.

Closing this PR because I'm doing the latest possible version of celery, and I've already updated epel7 branch of kombu accordingly...

Pull-Request has been closed by ngompa

3 years ago