Update to 0.30.0a0 and fix FTBFS.
This commit is contained in:
parent
0a308dc20a
commit
5ac60a98db
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/wheel-0.24.0.tar.gz
|
||||
/wheel-0.26.0.tar.gz
|
||||
/wheel-0.29.0.tar.gz
|
||||
/wheel-0.30.0a0.tar.gz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
%global pypi_name wheel
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 0.29.0
|
||||
Version: 0.30.0a0
|
||||
Release: 1%{?dist}
|
||||
Summary: A built-package format for Python
|
||||
|
||||
@ -10,6 +10,15 @@ URL: https://bitbucket.org/pypa/wheel
|
||||
Source0: https://files.pythonhosted.org/packages/source/%(n=%{pypi_name}; echo ${n:0:1})/%{pypi_name}/%{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
|
||||
|
||||
%global _description \
|
||||
A built-package format for Python.\
|
||||
\
|
||||
@ -46,9 +55,10 @@ BuildRequires: python3-jsonschema
|
||||
Python 3 version.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pypi_name}-%{version}
|
||||
%setup -q -n %{pypi_name}-%{version}
|
||||
# remove unneeded shebangs
|
||||
sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
@ -87,6 +97,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
|
||||
%exclude %{python3_sitelib}/%{pypi_name}/test
|
||||
|
||||
%changelog
|
||||
* Mon Sep 19 2016 Charalampos Stratakis <cstratak@redhat.com> - 0.30.0a0-1
|
||||
- Update to 0.30.0a0
|
||||
- Added patch to remove keyrings.alt dependency
|
||||
|
||||
* Wed Aug 10 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.29.0-1
|
||||
- Update to 0.29.0
|
||||
- Cleanups and fixes
|
||||
|
||||
29
remove-keyrings.alt-dependency.patch
Normal file
29
remove-keyrings.alt-dependency.patch
Normal file
@ -0,0 +1,29 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
index bd1c900..9579fac 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -39,7 +39,7 @@ setup(name='wheel',
|
||||
],
|
||||
extras_require={
|
||||
':python_version=="2.6"': ['argparse'],
|
||||
- 'signatures': ['keyring', 'keyrings.alt'],
|
||||
+ 'signatures': ['keyring'],
|
||||
'signatures:sys_platform!="win32"': ['pyxdg'],
|
||||
'signatures:python_version=="2.6"': ['importlib'],
|
||||
'faster-signatures': ['ed25519ll'],
|
||||
diff --git a/wheel/tool/__init__.py b/wheel/tool/__init__.py
|
||||
index 4c0187b..81eae0e 100644
|
||||
--- a/wheel/tool/__init__.py
|
||||
+++ b/wheel/tool/__init__.py
|
||||
@@ -29,9 +29,8 @@ def get_keyring():
|
||||
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.")
|
||||
+ except ImportError:
|
||||
+ raise WheelError("Install wheel[signatures] (requires keyring, pyxdg) for signatures.")
|
||||
return keys.WheelKeys, keyring
|
||||
|
||||
def keygen(get_keyring=get_keyring):
|
||||
Loading…
Reference in New Issue
Block a user