!5 update to 0.34.2

Merge pull request !5 from 桐小哥/master

python-wheel.spec

@@ -1,7 +1,13 @@
 %bcond_with bootstrap
+%if %{with bootstrap}
+%bcond_with tests
+%else
+%bcond_without tests
+%endif
+
 Name:           python-wheel
-Version:        0.31.1
+Version:        0.34.2
-Release:        4
+Release:        1
 Epoch:          1
 Summary:        Built-package format for Python
 License:        MIT
@@ -9,7 +15,13 @@ URL:            https://github.com/pypa/wheel
 Source0:        %{url}/archive/%{version}/wheel-%{version}.tar.gz
 BuildArch:      noarch
 
-Patch0000:      remove-keyrings.alt-dependency.patch
+%if %{with tests}
+# several tests compile extensions
+# those tests are skipped if gcc is not found
+BuildRequires:  gcc python3-wheel
+%endif
+ 
+%{?python_enable_dependency_generator}
 
 %description
 A built-package format for Python.
@@ -17,26 +29,10 @@ A wheel is a ZIP-format archive with a specially formatted filename and the
 .whl extension. It is designed to contain all the files for a PEP 376
 compatible install in a way that is very close to the on-disk format.
 
-%package -n     python2-wheel
-Summary:        Built-package format for Python
-BuildRequires:  python2-devel python2-setuptools
-%if ! %{with bootstrap}
-BuildRequires:  python2-pytest python2-pyxdg python2-keyring
-%endif
-%{?python_provide:%python_provide python2-wheel}
-
-%description -n python2-wheel
-A built-package format for Python.
-A wheel is a ZIP-format archive with a specially formatted filename and the
-.whl extension. It is designed to contain all the files for a PEP 376
-compatible install in a way that is very close to the on-disk format.
-Python 2 version.
-
-
 %package -n     python3-wheel
 Summary:        Built-package format for Python
-BuildRequires:  python3-devel python3-setuptools
+BuildRequires:  python3-devel python3-setuptools python3-rpm-generators
-%if %{without bootstrap}
+%if %{with tests}
 BuildRequires:  python3-pytest python3-pyxdg python3-keyring
 %endif
 %{?python_provide:%python_provide python3-wheel}
@@ -60,11 +56,8 @@ A Python wheel of wheel to use with virtualenv.
 
 %prep
 %autosetup -n wheel-%{version} -p1
-sed -ie '1d' wheel/{egg2wheel,wininst2wheel}.py
-
 
 %build
-%py2_build
 %py3_build
 
 %if %{without bootstrap}
@@ -76,35 +69,22 @@ sed -ie '1d' wheel/{egg2wheel,wininst2wheel}.py
 %py3_install
 mv %{buildroot}%{_bindir}/wheel{,-%{python3_version}}
 ln -s wheel-%{python3_version} %{buildroot}%{_bindir}/wheel-3
-
+ln -s wheel-3 %{buildroot}%{_bindir}/wheel
-%py2_install
-mv %{buildroot}%{_bindir}/wheel{,-%{python2_version}}
-ln -s wheel-%{python2_version} %{buildroot}%{_bindir}/wheel-2
-ln -s wheel-2 %{buildroot}%{_bindir}/wheel
 
 %if %{without bootstrap}
 install -d %{buildroot}%{_datadir}/python-wheels
 install -p dist/wheel-%{version}-py2.py3-none-any.whl -t %{buildroot}%{_datadir}/python-wheels
 
-
 %check
 export LC_ALL=C.UTF-8
 rm setup.cfg
-PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build
 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 %endif
 
-
-%files -n python2-wheel
-%license LICENSE.txt
-%doc CHANGES.txt README.rst
-%{_bindir}/wheel
-%{_bindir}/wheel-2*
-%{python2_sitelib}/wheel*
-
 %files -n python3-wheel
 %license LICENSE.txt
-%doc CHANGES.txt README.rst
+%doc README.rst
+%{_bindir}/wheel
 %{_bindir}/wheel-3*
 %{python3_sitelib}/wheel*
 
@@ -116,5 +96,8 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 %endif
 
 %changelog
+* Tue Jul 28 2020 shixuantong<shixuantong@huawei.com> - 0.34.2
+- update to 0.34-2
+
 * Mon Dec 2 2019 yangjian<yangjian79@huawei.com> - 1:0.31.1-4
 - Package init

remove-keyrings.alt-dependency.patch

@@ -1,27 +0,0 @@
-diff -uNr wheel-0.31.1.orig/setup.py wheel-0.31.1/setup.py
---- wheel-0.31.1.orig/setup.py	2018-05-13 19:22:12.000000000 +0200
-+++ wheel-0.31.1/setup.py	2018-07-08 00:32:02.918116087 +0200
-@@ -39,7 +39,7 @@
-       packages=find_packages(),
-       python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
-       extras_require={
--          'signatures': ['keyring', 'keyrings.alt'],
-+          'signatures': ['keyring'],
-           'signatures:sys_platform!="win32"': ['pyxdg'],
-           'faster-signatures': ['ed25519ll'],
-           'test': ['pytest >= 3.0.0', 'pytest-cov']
-diff -uNr wheel-0.31.1.orig/wheel/tool/__init__.py wheel-0.31.1/wheel/tool/__init__.py
---- wheel-0.31.1.orig/wheel/tool/__init__.py	2018-05-13 19:22:12.000000000 +0200
-+++ wheel-0.31.1/wheel/tool/__init__.py	2018-07-08 00:32:21.442263844 +0200
-@@ -33,10 +33,9 @@
-     try:
-         from ..signatures import keys
-         import keyring
--        assert keyring.get_keyring().priority
-     except (ImportError, AssertionError):
-         raise WheelError(
--            "Install wheel[signatures] (requires keyring, keyrings.alt, pyxdg) for signatures.")
-+            "Install wheel[signatures] (requires keyring, pyxdg) for signatures.")
- 
-     return keys.WheelKeys, keyring
-