From a5ca80aacc5d542d2b35dca72a2d4eda83a9fb38 Mon Sep 17 00:00:00 2001 From: sagitter Date: Jan 24 2020 11:06:53 +0000 Subject: Release 0.18.2 --- diff --git a/.gitignore b/.gitignore index 710c45d..f2bae88 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /python-future-c423752879acc05eebc29b0bb9909327bd5c7308.tar.gz /python-future-23989c4d61a5e3b2308b107efc1402bc727e8fe6.tar.gz /future-0.18.0.tar.gz +/future-0.18.2.tar.gz diff --git a/future.spec b/future.spec index 70dbbb6..ad25580 100644 --- a/future.spec +++ b/future.spec @@ -7,10 +7,6 @@ %global with_python2 1 %endif -#%%global commit 23989c4d61a5e3b2308b107efc1402bc727e8fe6 -#%%global date 20190506 -#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7}) - %global _description \ future is the missing compatibility layer between Python 2 and \ Python 3. It allows you to use a single, clean Python 3.x-compatible \ @@ -24,11 +20,11 @@ clean Py3-style codebase, module by module. Name: future Summary: Easy, clean, reliable Python 2/3 compatibility -Version: 0.18.0 -Release: 2%{?dist} +Version: 0.18.2 +Release: 1%{?dist} License: MIT URL: http://python-future.org/ -Source0: https://github.com/PythonCharmers/python-%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/f/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch # https://github.com/PythonCharmers/python-future/issues/165 @@ -72,11 +68,10 @@ BuildRequires: python%{python3_pkgversion}-numpy BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python%{python3_pkgversion}-pytest Provides: future-python3 = 0:%{version}-%{release} -%if 0%{?fedora} -Obsoletes: python2-%{name} -%endif -%if 0%{?rhel} -Obsoletes: python34-%{name} +%if 0%{?fedora} && 0%{?fedora} > 30 +Obsoletes: python2-%{name} < 0:%{version}-%{release} +Obsoletes: %{name}-python2 < 0:%{version}-%{release} +Provides: future = 0:%{version}-%{release} %endif %description -n python%{python3_pkgversion}-%{name} @@ -94,6 +89,9 @@ BuildRequires: python%{python3_other_pkgversion}-numpy BuildRequires: python%{python3_other_pkgversion}-requests BuildRequires: python%{python3_other_pkgversion}-pytest Provides: future-python%{python3_other_pkgversion} = 0:%{version}-%{release} +%if 0%{?rhel} && 0%{?rhel} < 8 +Obsoletes: python34-%{name} < 0:%{version}-%{release} +%endif %description -n python%{python3_other_pkgversion}-%{name} %{_description} @@ -108,18 +106,18 @@ popd %if 0%{?with_python2} cp -a future-%{version} python2 -find python2 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' +find python2 -name '*.py' | xargs pathfix.py -pn -i "%{__python2}" %endif %if 0%{?with_python3} cp -a future-%{version} python3 -find python3 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' +find python3 -name '*.py' | xargs pathfix.py -pn -i "%{__python3}" %endif # with_python3 %if 0%{?with_python3_other} cp -a future-%{version} python%{python3_other_pkgversion} -find python%{python3_other_pkgversion} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' +find python%{python3_other_pkgversion} -name '*.py' | xargs pathfix.py -pn -i "%{__python3}" %endif %build @@ -193,9 +191,11 @@ popd # https://github.com/PythonCharmers/python-future/issues/508 %if 0%{?with_python3} pushd python3 -PYTHONPATH=$PWD/build/lib py.test-%{python3_version} \ %if 0%{?python3_version_nodots} > 37 --k "not test_pow and not test_urllib2" +PYTHONPATH=$PWD/build/lib py.test-%{python3_version} -k "not test_pow and not test_urllib2" +%endif +%if 0%{?python3_version_nodots} <= 37 +PYTHONPATH=$PWD/build/lib py.test-%{python3_version} %endif popd %endif @@ -270,6 +270,9 @@ popd %changelog +* Fri Jan 24 2020 Antonio Trande - 0.18.2-1 +- Release 0.18.2 + * Sat Oct 12 2019 Antonio Trande - 0.18.0-2 - Use python3_version_nodots macro diff --git a/sources b/sources index ed8e034..ec3463c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (future-0.18.0.tar.gz) = c2bf1741d548d007f25dd77e12899cca6167b627815a8b1963efe2df69ef35c3c05a774ada74d104b3ed7c976a53e270035e84fcd980fd57fe3c597c571af46f +SHA512 (future-0.18.2.tar.gz) = 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2