upgrade version to 0.36.2

python-wheel.spec

@@ -1,7 +1,7 @@
 %bcond_with bootstrap
 Name:           python-wheel
-Version:        0.31.1
+Version:        0.36.2
-Release:        5
+Release:        1
 Epoch:          1
 Summary:        Built-package format for Python
 License:        MIT
@@ -9,8 +9,6 @@ URL:            https://github.com/pypa/wheel
 Source0:        %{url}/archive/%{version}/wheel-%{version}.tar.gz
 BuildArch:      noarch
 
-Patch0000:      remove-keyrings.alt-dependency.patch
-
 %description
 A built-package format for Python.
 A wheel is a ZIP-format archive with a specially formatted filename and the
@@ -44,29 +42,24 @@ A Python wheel of wheel to use with virtualenv.
 
 %prep
 %autosetup -n wheel-%{version} -p1
-sed -ie '1d' wheel/{egg2wheel,wininst2wheel}.py
-
 
 %build
 %py3_build
 
-%if %{without bootstrap}
-%py3_build_wheel
-%endif
-
-
 %install
 %py3_install
 mv %{buildroot}%{_bindir}/wheel{,-%{python3_version}}
 ln -s wheel-%{python3_version} %{buildroot}%{_bindir}/wheel-3
 
 %if %{without bootstrap}
+# We can only use bdist_wheel when wheel is installed, hence we don't build the wheel in %%build
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+%py3_build_wheel 
 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}%{python3_sitelib} py.test-3 -v --ignore build
 %endif
@@ -74,7 +67,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 
 %files -n python3-wheel
 %license LICENSE.txt
-%doc CHANGES.txt README.rst
+%doc README.rst
 %{_bindir}/wheel-3*
 %{python3_sitelib}/wheel*
 
@@ -86,6 +79,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 %endif
 
 %changelog
+* Wed Feb 03 2021 shixuantong<shixuantong@huawei.com> - 0.36.2-1
+- upgrade version to 0.36.2
+
 * Mon Nov 2 2020 wangjie<wangjie294@huawei.com> -0.31.1-5
 - Type:NA
 - ID:NA

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
-