Update to 0.32.0, no longer needs keyring
This commit is contained in:
Miro Hrončok
parent
b68da5d6ea
commit
03fc6b42b4
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@
|
||||
/wheel-0.30.0a0.tar.gz
|
||||
/wheel-0.30.0.tar.gz
|
||||
/wheel-0.31.1.tar.gz
|
||||
/wheel-0.32.0.tar.gz
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
%global python_wheeldir %{_datadir}/python-wheels
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 0.31.1
|
||||
Release: 3%{?dist}
|
||||
Version: 0.32.0
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Built-package format for Python
|
||||
|
||||
@ -19,14 +19,13 @@ URL: https://github.com/pypa/wheel
|
||||
Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
# Latest version of wheel requires the package keyrings.alt in order for the tests to pass,
|
||||
# however it can't be packaged for Fedora as of yet since the code is not licensed,
|
||||
# and as a result wheel fails to build from source.
|
||||
# Review request of keyrings.alt: https://bugzilla.redhat.com/show_bug.cgi?id=1365794
|
||||
# Until the license issue is resolved upstream, this patch is added to revert
|
||||
# the commit from wheel, that introduced this dependency.
|
||||
# https://bitbucket.org/pypa/wheel/commits/06841295888fdb430abe12aae29da92107e7360a
|
||||
Patch0: remove-keyrings.alt-dependency.patch
|
||||
%if ! %{with bootstrap}
|
||||
# several tests compile extensions
|
||||
# those tests are skipped if gcc is not found
|
||||
BuildRequires: gcc
|
||||
%endif
|
||||
|
||||
%{?python_enable_dependency_generator}
|
||||
|
||||
%global _description \
|
||||
A built-package format for Python.\
|
||||
@ -44,8 +43,6 @@ BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
%if ! %{with bootstrap}
|
||||
BuildRequires: python2-pytest
|
||||
BuildRequires: python2-pyxdg
|
||||
BuildRequires: python2-keyring
|
||||
%endif
|
||||
%{?python_provide:%python_provide python2-%{pypi_name}}
|
||||
|
||||
@ -61,8 +58,6 @@ BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
%if %{without bootstrap}
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-pyxdg
|
||||
BuildRequires: python3-keyring
|
||||
%endif
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
@ -82,8 +77,9 @@ A Python wheel of wheel to use with virtualenv.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pypi_name}-%{version} -p1
|
||||
# remove unneeded shebangs
|
||||
sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py
|
||||
|
||||
# Empty files make rpmlint sad
|
||||
test -s wheel/cli/install.py || echo "# empty" > wheel/cli/install.py
|
||||
|
||||
|
||||
%build
|
||||
@ -115,7 +111,6 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
|
||||
|
||||
|
||||
%check
|
||||
export LC_ALL=C.UTF-8
|
||||
rm setup.cfg
|
||||
%if %{with python2}
|
||||
PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build
|
||||
@ -126,7 +121,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
|
||||
%if %{with python2}
|
||||
%files -n python2-%{pypi_name}
|
||||
%license LICENSE.txt
|
||||
%doc CHANGES.txt README.rst
|
||||
%doc README.rst
|
||||
%{_bindir}/%{pypi_name}
|
||||
%{_bindir}/%{pypi_name}-2
|
||||
%{_bindir}/%{pypi_name}-%{python2_version}
|
||||
@ -135,7 +130,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
|
||||
|
||||
%files -n python3-%{pypi_name}
|
||||
%license LICENSE.txt
|
||||
%doc CHANGES.txt README.rst
|
||||
%doc README.rst
|
||||
%{_bindir}/%{pypi_name}-3
|
||||
%{_bindir}/%{pypi_name}-%{python3_version}
|
||||
%{python3_sitelib}/%{pypi_name}*
|
||||
@ -149,6 +144,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun Sep 30 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.32.0-1
|
||||
- Update to 0.32.0
|
||||
|
||||
* Wed Aug 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.31.1-3
|
||||
- Create python-wheel-wheel package with the wheel of wheel
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (wheel-0.31.1.tar.gz) = 148e8c9a050a2646f0df5ea4f69be78d6ea076eeec3d24c93a8f40a0882f843931c65b4da69a2de07abe983a345c7963d18e56100bc64f23deffc6e1db84e777
|
||||
SHA512 (wheel-0.32.0.tar.gz) = 02a0263c3ccd5a5d670793ffe8d39478f7ad858ece0f5241e0ec5f885a0a3dcc4348e94c0c0273edf4872c2b525dbb398ccc01b6e1d69bddf93c593dbdff2649
|
||||
|
||||
Loading…
Reference in New Issue
Block a user