Update to 0.30.0
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
b9d3435f6e
commit
14a14e2c5d
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/wheel-0.26.0.tar.gz
|
||||
/wheel-0.29.0.tar.gz
|
||||
/wheel-0.30.0a0.tar.gz
|
||||
/wheel-0.30.0.tar.gz
|
||||
|
@ -8,9 +8,10 @@
|
||||
%global pypi_name wheel
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 0.30.0a0
|
||||
Release: 9%{?dist}
|
||||
Summary: A built-package format for Python
|
||||
Version: 0.30.0
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Built-package format for Python
|
||||
|
||||
License: MIT
|
||||
URL: https://bitbucket.org/pypa/wheel
|
||||
@ -136,6 +137,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Feb 23 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.30.0-1
|
||||
- Update to 0.30.0
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0a0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
@ -1,29 +1,27 @@
|
||||
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',
|
||||
],
|
||||
diff -uNr wheel-0.30.0.orig/setup.py wheel-0.30.0/setup.py
|
||||
--- wheel-0.30.0.orig/setup.py 2017-07-29 22:08:53.000000000 +0200
|
||||
+++ wheel-0.30.0/setup.py 2018-02-23 13:30:44.736351678 +0100
|
||||
@@ -38,7 +38,7 @@
|
||||
license='MIT',
|
||||
packages=find_packages(),
|
||||
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():
|
||||
'tool': [],
|
||||
diff -uNr wheel-0.30.0.orig/wheel/tool/__init__.py wheel-0.30.0/wheel/tool/__init__.py
|
||||
--- wheel-0.30.0.orig/wheel/tool/__init__.py 2017-08-06 13:31:33.000000000 +0200
|
||||
+++ wheel-0.30.0/wheel/tool/__init__.py 2018-02-23 13:30:33.861317739 +0100
|
||||
@@ -31,10 +31,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.")
|
||||
+ except ImportError:
|
||||
+ raise WheelError("Install wheel[signatures] (requires keyring, pyxdg) for signatures.")
|
||||
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
|
||||
|
||||
def keygen(get_keyring=get_keyring):
|
||||
|
Loading…
x
Reference in New Issue
Block a user