rpms/python-wheel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import python-wheel-0.31.1-2.module+el8.1.0+3724+3c097090

Browse Source
This commit is contained in:
CentOS Sources 2020-01-21 16:18:23 -05:00 committed by Stepan Oksanichenko
parent 90310c1e47
commit 3d8dc05343
5 changed files with 1314 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/wheel-0.30.0.tar.gz
SOURCES/wheel-0.31.1.tar.gz

2
.python-wheel.metadata
View File

@ -1 +1 @@
bf1b7cf2c46378b7300ad9d4e2b86e462cdd7f73 SOURCES/wheel-0.30.0.tar.gz
9adb566f0f481cf14f4d5d5083f93c036b9aeba1 SOURCES/wheel-0.31.1.tar.gz

27
SOURCES/remove-keyrings.alt-dependency.patch
View File

@ -1,27 +0,0 @@
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={
- 'signatures': ['keyring', 'keyrings.alt'],
+ 'signatures': ['keyring'],
'signatures:sys_platform!="win32"': ['pyxdg'],
'faster-signatures': ['ed25519ll'],
'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.")
+ "Install wheel[signatures] (requires keyring, pyxdg) for signatures.")
return keys.WheelKeys, keyring

1207
SOURCES/removed-wheel-signing-and-verifying-features.patch Normal file
View File

File diff suppressed because it is too large Load Diff

140
SPECS/python-wheel.spec
View File

@ -1,26 +1,32 @@
# Note that the only function of bootstrap is that it disables the test suite:
# bcond_with bootstrap = tests enabled
%bcond_without bootstrap
# Note(hguemar): EL7 has no python3 stack but EPEL does
%if 0%{?rhel} && 0%{?rhel} <= 7 && 0%{!?epel:1}
%define _without_python3 1
%endif
%if 0%{?_with_python27_module}
%undefine _without_python3
%endif
# Note that the function of bootstrap is that it disables the test suite and whl
# bcond_with bootstrap = tests enabled, package with whl created
%bcond_with bootstrap
%bcond_with python36_module
%bcond_without python2
%bcond_with python2
%bcond_without python3
%global pypi_name wheel
%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
%if %{with python2}
%global python2_wheeldir %{_datadir}/python2-wheels
%global python2_wheelname %python_wheelname
%endif # with python2
%if %{with python3}
%global python3_wheeldir %{_datadir}/python3-wheels
%global python3_wheelname %python_wheelname
%endif # with python3
Name: python-%{pypi_name}
Version: 0.30.0
Release: 13%{?dist}
Version: 0.31.1
Release: 2%{?dist}
Epoch: 1
Summary: Built-package format for Python
@ -29,14 +35,10 @@ 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
# We need to remove wheel's own implementation of crypto due to FIPS concerns.
# See more: https://bugzilla.redhat.com/show_bug.cgi?id=1731526
# Upstream commit: https://github.com/pypa/wheel/commit/d3f5918ccbb1c79e2fc42b7766626a0aa20dc438
Patch0: removed-wheel-signing-and-verifying-features.patch
%global _description \
A built-package format for Python.\
@ -60,7 +62,7 @@ BuildRequires: python2-pytest
%description -n python2-%{pypi_name} %{_description}
Python 2 version.
%endif
%endif # with python2
%if %{with python3}
@ -73,9 +75,9 @@ BuildRequires: python36-rpm-macros
BuildRequires: python3-devel
%endif
BuildRequires: python3-setuptools
%if ! %{with bootstrap}
%if %{without bootstrap}
BuildRequires: python3-pytest
%endif
%endif # without bootstrap
# For alternatives
Requires: python36
Requires(post): python36
@ -85,6 +87,26 @@ Requires(postun): python36
%description -n python3-%{pypi_name} %{_description}
Python 3 version.
%endif # with python3
%if %{without bootstrap}
%if %{with python2}
%package -n python2-%{pypi_name}-wheel
Summary: The Python wheel module packaged as a wheel
%description -n python2-%{pypi_name}-wheel
A Python wheel of wheel to use with virtualenv.
%endif
%if %{with python3}
%package -n python3-%{pypi_name}-wheel
Summary: The Python wheel module packaged as a wheel
%description -n python3-%{pypi_name}-wheel
A Python wheel of wheel to use with virtualenv.
%endif
%endif
@ -93,21 +115,25 @@ Python 3 version.
# remove unneeded shebangs
sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py
# Remove tests for optional functionality which depends on bad crypto
# (pycryptopp -> python-keyring -> python-wheel)
# See https://bugzilla.redhat.com/show_bug.cgi?id=1561576
rm tests/test_signatures.py
sed -i -e's/^def test_keygen():$/def skip_test_keygen():/' tests/test_tool.py
%build
%if %{with python2}
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
%py2_build
%endif
%if %{without bootstrap}
%py2_build_wheel
%endif # without bootstrap
%endif # with python2
%if %{with python3}
%py3_build
%endif
%if %{without bootstrap}
%py3_build_wheel
%endif # without bootstrap
%endif # with python3
%install
@ -125,21 +151,33 @@ mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}}
ln -s %{pypi_name}-%{python2_version} %{buildroot}%{_bindir}/%{pypi_name}-2
%endif
%if ! %{with bootstrap}
%if %{without bootstrap}
%if %{with python2}
mkdir -p %{buildroot}%{python2_wheeldir}
install -p dist/%{python2_wheelname} -t %{buildroot}%{python2_wheeldir}
%endif
%if %{with python3}
mkdir -p %{buildroot}%{python3_wheeldir}
install -p dist/%{python3_wheelname} -t %{buildroot}%{python3_wheeldir}
%endif
%check
rm setup.cfg
# Remove part of the test that uses the "jsonschema" package
sed -i '/jsonschema/d' tests/test_bdist_wheel.py
export LC_ALL=C.UTF-8
%if %{with python2}
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build
%endif
%endif # with python2
%if %{with python3}
PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
%endif
%endif
%endif # with python3
%endif # without bootstrap
%if %{with python3}
@ -176,7 +214,39 @@ fi
%{python3_sitelib}/%{pypi_name}*
%endif
%if %{without bootstrap}
%if %{with python2}
%files -n python2-%{pypi_name}-wheel
%license LICENSE.txt
# we own the dir for simplicity
%dir %{python2_wheeldir}/
%{python2_wheeldir}/%{python2_wheelname}
%endif
%if %{with python3}
%files -n python3-%{pypi_name}-wheel
%license LICENSE.txt
# we own the dir for simplicity
%dir %{python3_wheeldir}/
%{python3_wheeldir}/%{python3_wheelname}
%endif
%endif
%changelog
* Mon Jul 22 2019 Tomas Orsava <torsava@redhat.com> - 1:0.31.1-2
- Removed wheel's own implementation of crypto due to FIPS concerns
Resolves: rhbz#1731526
* Fri Jun 21 2019 Charalampos Stratakis <cstratak@redhat.com> - 1:0.31.1-1
- Update to 0.31.1
Resolves: rhbz#1671681
* Thu Jun 20 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.30.0-14
- Create python{2,3}-wheel-wheel packages with the wheel of wheel
Resolves: rhbz#1659550
* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 1:0.30.0-13
- Bumping due to problems with modular RPM upgrade path
- Resolves: rhbz#1695587