#2 bump to 5.0.2
Merged 5 years ago by sgallagh. Opened 5 years ago by snecker.
Unknown source master  into  master

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

- /tenacity-3.0.0.tar.gz

- /tenacity-3.2.1.tar.gz

- /tenacity-4.4.0.tar.gz

- /tenacity-4.8.0.tar.gz

- /tenacity-4.9.0.tar.gz

- /tenacity-4.12.0.tar.gz

+ /tenacity-*.tar.gz

file modified
+39 -20
@@ -1,21 +1,27 @@

  %global pypi_name tenacity

- 

- %if 0%{?fedora} >= 24

- %global with_python3 1

+ %global common_desc  Tenacity is a general purpose retrying library

+ 

+ %if 0%{?fedora} || 0%{?rhel} > 7

+ %bcond_with    python2

+ %bcond_without python3

+ %else

+ %bcond_without python2

+ %bcond_with    python3

  %endif

  

- Name:           python-tenacity

- Version:        4.12.0

- Release:        2%{?dist}

- Summary:        Tenacity is a general purpose retrying library

+ Name:           python-%{pypi_name}

+ Version:        5.0.2

+ Release:        1%{?dist}

+ Summary:        %{common_desc}

  License:        ASL 2.0

- URL:            https://github.com/jd/tenacity

+ URL:            https://github.com/jd/%{pypi_name}

  Source0:        https://pypi.io/packages/source/t/%{pypi_name}/%{pypi_name}-%{version}.tar.gz

  BuildArch:      noarch

  

+ %if %{with python2}

  %package -n python2-%{pypi_name}

- Summary:         Tenacity is a general purpose retrying library

- %{?python_provide:%python_provide python2-tenacity}

+ Summary:        %{common_desc}

+ %{?python_provide:%python_provide python2-%{pypi_name}}

  

  BuildRequires:    python2-setuptools

  BuildRequires:    python2-devel
@@ -33,12 +39,13 @@

  

  

  %description -n python2-%{pypi_name}

-  Tenacity is a general purpose retrying library

+ %{common_desc}

+ %endif

  

- %if 0%{?with_python3}

+ %if %{with python3}

  %package -n python3-%{pypi_name}

  

- Summary:          Tenacity is a general purpose retrying library

+ Summary:          %{common_desc}

  %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}

  

  BuildRequires:    python3-setuptools
@@ -70,35 +77,42 @@

  %autosetup -n %{pypi_name}-%{version}

  

  %build

+ %if %{with python2}

  %py2_build

- 

- %if 0%{?with_python3}

+ %endif

+ %if %{with python3}

  %py3_build

  %endif

  

  %install

- %if 0%{?with_python3}

- %py3_install

- %endif

+ %if %{with python2}

  %py2_install

  # Remove python3-only code (asyncio)

  for file in _asyncio.py tests/test_asyncio.py; do

    rm %{buildroot}/%{python2_sitelib}/%{pypi_name}/$file

  done

+ %endif

+ %if %{with python3}

+ %py3_install

+ %endif

  

  %check

- %if 0%{?with_python3}

+ %if %{with python3}

  # XXX: fails under python3

  pytest-3

  %endif

+ %if %{with python2}

  pytest --ignore='tenacity/tests/test_asyncio.py'

+ %endif

  

+ %if %{with python2}

  %files -n python2-%{pypi_name}

  %doc README.rst

  %license LICENSE

  %{python2_sitelib}/*

+ %endif

  

- %if 0%{?with_python3}

+ %if %{with python3}

  %files -n python3-%{pypi_name}

  %doc README.rst

  %license LICENSE
@@ -107,6 +121,11 @@

  

  

  %changelog

+  * Tue Dec 4 2018 Christopher Brown <chris.brown@redhat.com> - 5.0.2-1

+ - Bump to 5.0.2

+   Add conditionals for F30 and CentOS

+   Add description macro

+ 

  * Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.12.0-2

  - Drop explicit locale setting

    See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot

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

- SHA512 (tenacity-4.12.0.tar.gz) = 0924600ae0b2306bfb4faefff1ac2cb5a4a7e3a98fcdc50a5bba54f55b5fa483ba63d087bea989e77c338f5acc1b8c4371e542c83122656bf3b887dfe720bbf0

+ SHA512 (tenacity-5.0.2.tar.gz) = b49484fff59a79e9ee55a73f1185b2c94e64a6d3cc14e161b2d4d93c1c63b8d1f2a1b5670030b4a09be58803c239c542f93a1df354f351df457af7f9e8f81cbd

Also remove python3 check macro

Closes BZ #1655974

Fedora 30 will only include python3 so this package should only provide python3 subpackage. Note that RDO use this spec to rebuild package for CentOS7 so it'd be great if we could maintain conditionals. An example https://src.fedoraproject.org/rpms/python-osc-lib/c/12b06cea7a2aeb1f979dc7a01a6ef7a71c206e8d?branch=master

rebased onto 8e596cb

5 years ago

Fedora 30 will only include python3 so this package should only provide python3 subpackage. Note that RDO use this spec to rebuild package for CentOS7 so it'd be great if we could maintain conditionals. An example https://src.fedoraproject.org/rpms/python-osc-lib/c/12b06cea7a2aeb1f979dc7a01a6ef7a71c206e8d?branch=master

Thanks Alfredo. I've updated the commit, perhaps you can double-check it.

Local and scratch builds have passed:

https://koji.fedoraproject.org/koji/taskinfo?taskID=31269180

and its only built the python3 package this time.

Fedora 30 will only include python3 so this package should only provide python3 subpackage. Note that RDO use this spec to rebuild package for CentOS7 so it'd be great if we could maintain conditionals. An example https://src.fedoraproject.org/rpms/python-osc-lib/c/12b06cea7a2aeb1f979dc7a01a6ef7a71c206e8d?branch=master

Thanks Alfredo. I've updated the commit, perhaps you can double-check it.
Local and scratch builds have passed:
https://koji.fedoraproject.org/koji/taskinfo?taskID=31269180
and its only built the python3 package this time.

Looks good to me.

Pull-Request has been merged by sgallagh

5 years ago