Compare commits
No commits in common. "c9s" and "c8" have entirely different histories.
14
.gitignore
vendored
14
.gitignore
vendored
@ -1,13 +1 @@
|
||||
/wheel-0.22.0.tar.gz
|
||||
/wheel-0.24.0.tar.gz
|
||||
/wheel-0.26.0.tar.gz
|
||||
/wheel-0.29.0.tar.gz
|
||||
/wheel-0.30.0a0.tar.gz
|
||||
/wheel-0.30.0.tar.gz
|
||||
/wheel-0.31.1.tar.gz
|
||||
/wheel-0.32.0.tar.gz
|
||||
/wheel-0.33.1.tar.gz
|
||||
/wheel-0.33.6.tar.gz
|
||||
/wheel-0.34.2.tar.gz
|
||||
/wheel-0.35.1.tar.gz
|
||||
/wheel-0.36.2.tar.gz
|
||||
SOURCES/wheel-0.30.0.tar.gz
|
||||
|
||||
1
.python-wheel.metadata
Normal file
1
.python-wheel.metadata
Normal file
@ -0,0 +1 @@
|
||||
bf1b7cf2c46378b7300ad9d4e2b86e462cdd7f73 SOURCES/wheel-0.30.0.tar.gz
|
||||
@ -1,82 +0,0 @@
|
||||
From 6c17cfae46efc6ff71bb58c8d1c87b86fdb3c668 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
|
||||
Date: Thu, 20 Oct 2022 17:13:23 +0300
|
||||
Subject: [PATCH 1/2] Fixed potential DoS attack via WHEEL_INFO_RE
|
||||
|
||||
---
|
||||
src/wheel/wheelfile.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/wheel/wheelfile.py b/src/wheel/wheelfile.py
|
||||
index 3ee97dd..3c3d9f5 100644
|
||||
--- a/src/wheel/wheelfile.py
|
||||
+++ b/src/wheel/wheelfile.py
|
||||
@@ -16,8 +16,8 @@ from wheel.util import urlsafe_b64decode, as_unicode, native, urlsafe_b64encode,
|
||||
# Non-greedy matching of an optional build number may be too clever (more
|
||||
# invalid wheel filenames will match). Separate regex for .dist-info?
|
||||
WHEEL_INFO_RE = re.compile(
|
||||
- r"""^(?P<namever>(?P<name>.+?)-(?P<ver>.+?))(-(?P<build>\d[^-]*))?
|
||||
- -(?P<pyver>.+?)-(?P<abi>.+?)-(?P<plat>.+?)\.whl$""",
|
||||
+ r"""^(?P<namever>(?P<name>[^-]+?)-(?P<ver>[^-]+?))(-(?P<build>\d[^-]*))?
|
||||
+ -(?P<pyver>[^-]+?)-(?P<abi>[^-]+?)-(?P<plat>[^.]+?)\.whl$""",
|
||||
re.VERBOSE)
|
||||
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
|
||||
From 22dcf5ec8f17771117f512b48d46c92a95f2d109 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
|
||||
Date: Sat, 5 Nov 2022 01:17:22 +0200
|
||||
Subject: [PATCH 2/2] Fixed parsing of wheel file names with multiple platform
|
||||
tags
|
||||
|
||||
Fixes #485.
|
||||
---
|
||||
src/wheel/wheelfile.py | 4 ++--
|
||||
tests/test_wheelfile.py | 13 ++++++++++---
|
||||
2 files changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/wheel/wheelfile.py b/src/wheel/wheelfile.py
|
||||
index 3c3d9f5..bce7ab3 100644
|
||||
--- a/src/wheel/wheelfile.py
|
||||
+++ b/src/wheel/wheelfile.py
|
||||
@@ -16,8 +16,8 @@ from wheel.util import urlsafe_b64decode, as_unicode, native, urlsafe_b64encode,
|
||||
# Non-greedy matching of an optional build number may be too clever (more
|
||||
# invalid wheel filenames will match). Separate regex for .dist-info?
|
||||
WHEEL_INFO_RE = re.compile(
|
||||
- r"""^(?P<namever>(?P<name>[^-]+?)-(?P<ver>[^-]+?))(-(?P<build>\d[^-]*))?
|
||||
- -(?P<pyver>[^-]+?)-(?P<abi>[^-]+?)-(?P<plat>[^.]+?)\.whl$""",
|
||||
+ r"""^(?P<namever>(?P<name>[^\s-]+?)-(?P<ver>[^\s-]+?))(-(?P<build>\d[^\s-]*))?
|
||||
+ -(?P<pyver>[^\s-]+?)-(?P<abi>[^\s-]+?)-(?P<plat>\S+)\.whl$""",
|
||||
re.VERBOSE)
|
||||
|
||||
|
||||
diff --git a/tests/test_wheelfile.py b/tests/test_wheelfile.py
|
||||
index db11bcd..69225f8 100644
|
||||
--- a/tests/test_wheelfile.py
|
||||
+++ b/tests/test_wheelfile.py
|
||||
@@ -16,9 +16,16 @@ def wheel_path(tmpdir):
|
||||
return str(tmpdir.join('test-1.0-py2.py3-none-any.whl'))
|
||||
|
||||
|
||||
-def test_wheelfile_re(tmpdir):
|
||||
- # Regression test for #208
|
||||
- path = tmpdir.join('foo-2-py3-none-any.whl')
|
||||
+@pytest.mark.parametrize(
|
||||
+ "filename",
|
||||
+ [
|
||||
+ "foo-2-py3-none-any.whl",
|
||||
+ "foo-2-py2.py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
|
||||
+ ],
|
||||
+)
|
||||
+def test_wheelfile_re(filename, tmpdir):
|
||||
+ # Regression test for #208 and #485
|
||||
+ path = tmpdir.join(filename)
|
||||
with WheelFile(str(path), 'w') as wf:
|
||||
assert wf.parsed_filename.group('namever') == 'foo-2'
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
27
SOURCES/remove-keyrings.alt-dependency.patch
Normal file
27
SOURCES/remove-keyrings.alt-dependency.patch
Normal file
@ -0,0 +1,27 @@
|
||||
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
|
||||
|
||||
227
SPECS/python-wheel.spec
Normal file
227
SPECS/python-wheel.spec
Normal file
@ -0,0 +1,227 @@
|
||||
# Note that the only function of bootstrap is that it disables the test suite:
|
||||
# bcond_with bootstrap = tests enabled
|
||||
%bcond_with 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
|
||||
|
||||
%bcond_with python2
|
||||
%bcond_without python3
|
||||
|
||||
%global pypi_name wheel
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 0.30.0
|
||||
Release: 6%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Built-package format for Python
|
||||
|
||||
License: MIT
|
||||
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
|
||||
|
||||
%global _description \
|
||||
A built-package format for Python.\
|
||||
\
|
||||
A wheel is a ZIP-format archive with a specially formatted filename and the\
|
||||
.whl extension. It is designed to contain all the files for a PEP 376\
|
||||
compatible install in a way that is very close to the on-disk format.
|
||||
|
||||
%description %{_description}
|
||||
|
||||
%if %{with python2}
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: %{summary}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
%if ! %{with bootstrap}
|
||||
BuildRequires: python2-pytest
|
||||
%endif
|
||||
%{?python_provide:%python_provide python2-%{pypi_name}}
|
||||
|
||||
%description -n python2-%{pypi_name} %{_description}
|
||||
|
||||
Python 2 version.
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: %{summary}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
%if ! %{with bootstrap}
|
||||
BuildRequires: python3-pytest
|
||||
%endif
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
%description -n python3-%{pypi_name} %{_description}
|
||||
|
||||
Python 3 version.
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pypi_name}-%{version} -p1
|
||||
# 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}
|
||||
%py2_build
|
||||
%endif
|
||||
%if %{with python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
%if %{with python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
|
||||
%endif
|
||||
|
||||
%if %{with python2}
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}}
|
||||
%endif
|
||||
|
||||
%if ! %{with bootstrap}
|
||||
%check
|
||||
rm setup.cfg
|
||||
|
||||
# Remove part of the test that uses the "jsonschema" package
|
||||
sed -i '/jsonschema/d' tests/test_bdist_wheel.py
|
||||
|
||||
%if %{with python2}
|
||||
PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build
|
||||
%endif
|
||||
%if %{with python3}
|
||||
PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python2-%{pypi_name}
|
||||
%license LICENSE.txt
|
||||
%doc CHANGES.txt README.rst
|
||||
%{_bindir}/%{pypi_name}-%{python2_version}
|
||||
%{python2_sitelib}/%{pypi_name}*
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%files -n python3-%{pypi_name}
|
||||
%license LICENSE.txt
|
||||
%doc CHANGES.txt README.rst
|
||||
%{_bindir}/%{pypi_name}-%{python3_version}
|
||||
%{python3_sitelib}/%{pypi_name}*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Aug 06 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-6
|
||||
- Remove unversioned executables (only *-3.6 should be provided)
|
||||
|
||||
* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-5
|
||||
- Don't build the python2 subpackage
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1594353
|
||||
|
||||
* Tue Jun 12 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-4
|
||||
- Also remove test dependency on python3-jsonschema
|
||||
|
||||
* Wed May 30 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-3
|
||||
- Remove test dependency on python2-jsonschema
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1584189
|
||||
|
||||
* Tue Apr 10 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-2
|
||||
- Remove build-time (test) dependency on python-keyring
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Aug 29 2017 Tomas Orsava <torsava@redhat.com> - 0.30.0a0-8
|
||||
- Switch macros to bcond's and make Python 2 optional to facilitate building
|
||||
the Python 2 and Python 3 modules
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0a0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0a0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jan 03 2017 Charalampos Stratakis <cstratak@redhat.com> - 0.30.0a0-5
|
||||
- Enable tests
|
||||
|
||||
* Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 0.30.0a0-4
|
||||
- Rebuild for Python 3.6 without tests
|
||||
|
||||
* Tue Dec 06 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.30.0a0-3
|
||||
- Add bootstrap method
|
||||
|
||||
* Mon Sep 19 2016 Charalampos Stratakis <cstratak@redhat.com> - 0.30.0a0-2
|
||||
- Use the python_provide macro
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26.0-3
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 0.26.0-1
|
||||
- Update to 0.26.0
|
||||
- Rebuilt for Python3.5 rebuild
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.24.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Jan 13 2015 Slavek Kabrda <bkabrda@redhat.com> - 0.24.0-3
|
||||
- Make spec buildable in EPEL 6, too.
|
||||
- Remove additional sources added to upstream tarball.
|
||||
|
||||
* Sat Jan 03 2015 Matej Cepl <mcepl@redhat.com> - 0.24.0-2
|
||||
- Make python3 conditional (switched off for RHEL-7; fixes #1131111).
|
||||
|
||||
* Mon Nov 10 2014 Slavek Kabrda <bkabrda@redhat.com> - 0.24.0-1
|
||||
- Update to 0.24.0
|
||||
- Remove patches merged upstream
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.22.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri Apr 25 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.22.0-3
|
||||
- Another rebuild with python 3.4
|
||||
|
||||
* Fri Apr 18 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.22.0-2
|
||||
- Rebuild with python 3.4
|
||||
|
||||
* Thu Nov 28 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 0.22.0-1
|
||||
- Initial package.
|
||||
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
@ -1,313 +0,0 @@
|
||||
# The function of bootstrap is that it disables the wheel subpackage
|
||||
%bcond_with bootstrap
|
||||
|
||||
# Default: when bootstrapping -> disable tests
|
||||
%if %{with bootstrap}
|
||||
%bcond_with tests
|
||||
%else
|
||||
%bcond_without tests
|
||||
%endif
|
||||
|
||||
# Similar to what we have in pythonX.Y.spec files.
|
||||
# If enabled, provides unversioned executables and other stuff.
|
||||
# Disable it if you build this package in an alternative stack.
|
||||
%bcond_without main_python
|
||||
|
||||
%global pypi_name wheel
|
||||
%global python_wheel_name %{pypi_name}-%{version}-py2.py3-none-any.whl
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 0.36.2
|
||||
Release: 8%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Built-package format for Python
|
||||
|
||||
# packaging is ASL 2.0 or BSD
|
||||
License: MIT and (ASL 2.0 or BSD)
|
||||
URL: https://github.com/pypa/wheel
|
||||
Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
# Security fix for CVE-2022-40898
|
||||
# Regex Fix which causes regression in wheel filename parsing:
|
||||
# https://github.com/pypa/wheel/commit/88f02bc335d5404991e532e7f3b0fc80437bf4e0
|
||||
# Wheel filename regression fix:
|
||||
# https://github.com/pypa/wheel/commit/44193907eb308930de05deed863fb4d157c5c866
|
||||
Patch: CVE-2022-40898.patch
|
||||
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
|
||||
# python3 bootstrap: this is rebuilt before the final build of python3, which
|
||||
# adds the dependency on python3-rpm-generators, so we require it manually
|
||||
BuildRequires: python3-rpm-generators
|
||||
|
||||
%if %{with tests}
|
||||
BuildRequires: python%{python3_pkgversion}-pytest
|
||||
# several tests compile extensions
|
||||
# those tests are skipped if gcc is not found
|
||||
BuildRequires: gcc
|
||||
%endif
|
||||
|
||||
%global _description %{expand:
|
||||
Wheel is the reference implementation of the Python wheel packaging standard,
|
||||
as defined in PEP 427.
|
||||
|
||||
It has two different roles:
|
||||
|
||||
1. A setuptools extension for building wheels that provides the bdist_wheel
|
||||
setuptools command.
|
||||
2. A command line tool for working with wheel files.}
|
||||
|
||||
%description %{_description}
|
||||
|
||||
# Virtual provides for the packages bundled by wheel.
|
||||
# Actual version can be found in git history:
|
||||
# https://github.com/pypa/wheel/commits/master/src/wheel/vendored/packaging/tags.py
|
||||
%global bundled %{expand:
|
||||
Provides: bundled(python3dist(packaging)) = 20.8
|
||||
}
|
||||
|
||||
|
||||
%package -n python%{python3_pkgversion}-%{pypi_name}
|
||||
Summary: %{summary}
|
||||
%{bundled}
|
||||
|
||||
%description -n python%{python3_pkgversion}-%{pypi_name} %{_description}
|
||||
|
||||
|
||||
%if %{without bootstrap}
|
||||
%package -n %{python_wheel_pkg_prefix}-%{pypi_name}-wheel
|
||||
Summary: The Python wheel module packaged as a wheel
|
||||
%{bundled}
|
||||
Provides: %{name}-wheel = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: %{name}-wheel < %{epoch}:%{version}-%{release}
|
||||
|
||||
# Older versions of python3-libs expect Python wheels at the old unversioned
|
||||
# location, so we conflict with the old Python versions that wouldn't work with
|
||||
# the new wheel location.
|
||||
Conflicts: python3-libs < 3.9.9-2
|
||||
|
||||
%description -n %{python_wheel_pkg_prefix}-%{pypi_name}-wheel
|
||||
A Python wheel of wheel to use with virtualenv.
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pypi_name}-%{version} -p1
|
||||
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
|
||||
|
||||
%install
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
|
||||
%if %{with main_python}
|
||||
ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
|
||||
ln -s %{pypi_name}-3 %{buildroot}%{_bindir}/%{pypi_name}
|
||||
%endif
|
||||
|
||||
%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
|
||||
mkdir -p %{buildroot}%{python_wheel_dir}
|
||||
install -p dist/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with tests}
|
||||
%check
|
||||
rm setup.cfg # to drop pytest coverage options configured there
|
||||
%pytest -v --ignore build
|
||||
%endif
|
||||
|
||||
%files -n python%{python3_pkgversion}-%{pypi_name}
|
||||
%license LICENSE.txt
|
||||
%doc README.rst
|
||||
%{_bindir}/%{pypi_name}-%{python3_version}
|
||||
%if %{with main_python}
|
||||
%{_bindir}/%{pypi_name}
|
||||
%{_bindir}/%{pypi_name}-3
|
||||
%endif
|
||||
%{python3_sitelib}/%{pypi_name}*/
|
||||
|
||||
%if %{without bootstrap}
|
||||
%files -n %{python_wheel_pkg_prefix}-%{pypi_name}-wheel
|
||||
%license LICENSE.txt
|
||||
# we own the dir for simplicity
|
||||
%dir %{python_wheel_dir}/
|
||||
%{python_wheel_dir}/%{python_wheel_name}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Apr 25 2023 Ryan Erickson <rerickso@redhat.com> - 1:0.36.2-8
|
||||
- Security fix for CVE-2022-40898
|
||||
- Resolves: rhbz#2178881
|
||||
|
||||
* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1:0.36.2-7
|
||||
- Add automatically generated Obsoletes tag with the python39- prefix
|
||||
for smoother upgrade from RHEL8
|
||||
- Related: rhbz#1990421
|
||||
|
||||
* Wed Nov 24 2021 Tomas Orsava <torsava@redhat.com> - 1:0.36.2-6
|
||||
- Conflict with old Python versions that use the old unversioned wheel location
|
||||
- Resolves: rhbz#1982668
|
||||
|
||||
* Wed Sep 22 2021 Tomas Orsava <torsava@redhat.com> - 1:0.36.2-5
|
||||
- Make the python-wheel-wheel subpackage versioned (python3-wheel-wheel),
|
||||
and move its contents to a versioned directory /usr/share/python3-wheels
|
||||
- Resolves: rhbz#1982668
|
||||
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.36.2-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.36.2-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.36.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jan 04 2021 Miro Hrončok <mhroncok@redhat.com> - 1:0.36.2-1
|
||||
- Update to 0.36.2
|
||||
- Fixes: rhbz#1907227
|
||||
- Fixes: rhbz#1899553
|
||||
|
||||
* Thu Sep 10 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:0.35.1-1
|
||||
- Update to 0.35.1
|
||||
- Fixes: rhbz#1868821
|
||||
|
||||
* Mon Aug 10 2020 Miro Hrončok <mhroncok@redhat.com> - 1:0.34.2-1
|
||||
- Update to 0.34.2
|
||||
- Drops Python 3.4 support
|
||||
- Fixes: rhbz#1795134
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.33.6-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-5
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-4
|
||||
- Bootstrap for Python 3.9
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.33.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Sep 09 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-2
|
||||
- Drop python2-wheel
|
||||
|
||||
* Tue Aug 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-1
|
||||
- Update to 0.33.6 (#1708194)
|
||||
- Don't add the m ABI flag to wheel names on Python 3.8
|
||||
|
||||
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-5
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-4
|
||||
- Bootstrap for Python 3.8
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.33.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jul 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-2
|
||||
- Make /usr/bin/wheel Python 3
|
||||
|
||||
* Mon Feb 25 2019 Charalampos Stratakis <cstratak@redhat.com> - 1:0.33.1-1
|
||||
- Update to 0.33.1
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.32.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.31.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sat Jul 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.31.1-1
|
||||
- Update to 0.31.1
|
||||
|
||||
* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.30.0-3
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.30.0-2
|
||||
- Bootstrap for Python 3.7
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Aug 29 2017 Tomas Orsava <torsava@redhat.com> - 0.30.0a0-8
|
||||
- Switch macros to bcond's and make Python 2 optional to facilitate building
|
||||
the Python 2 and Python 3 modules
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0a0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0a0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jan 03 2017 Charalampos Stratakis <cstratak@redhat.com> - 0.30.0a0-5
|
||||
- Enable tests
|
||||
|
||||
* Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 0.30.0a0-4
|
||||
- Rebuild for Python 3.6 without tests
|
||||
|
||||
* Tue Dec 06 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.30.0a0-3
|
||||
- Add bootstrap method
|
||||
|
||||
* Mon Sep 19 2016 Charalampos Stratakis <cstratak@redhat.com> - 0.30.0a0-2
|
||||
- Use the python_provide macro
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26.0-3
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 0.26.0-1
|
||||
- Update to 0.26.0
|
||||
- Rebuilt for Python3.5 rebuild
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.24.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Jan 13 2015 Slavek Kabrda <bkabrda@redhat.com> - 0.24.0-3
|
||||
- Make spec buildable in EPEL 6, too.
|
||||
- Remove additional sources added to upstream tarball.
|
||||
|
||||
* Sat Jan 03 2015 Matej Cepl <mcepl@redhat.com> - 0.24.0-2
|
||||
- Make python3 conditional (switched off for RHEL-7; fixes #1131111).
|
||||
|
||||
* Mon Nov 10 2014 Slavek Kabrda <bkabrda@redhat.com> - 0.24.0-1
|
||||
- Update to 0.24.0
|
||||
- Remove patches merged upstream
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.22.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri Apr 25 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.22.0-3
|
||||
- Another rebuild with python 3.4
|
||||
|
||||
* Fri Apr 18 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.22.0-2
|
||||
- Rebuild with python 3.4
|
||||
|
||||
* Thu Nov 28 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 0.22.0-1
|
||||
- Initial package.
|
||||
1
sources
1
sources
@ -1 +0,0 @@
|
||||
SHA512 (wheel-0.36.2.tar.gz) = 23f3dd0540ecc8e762f37a4bb69713abe99125a605c03b1a3412cec910fb7a6cea3eee3910d7c98122b276170a17414c9132b57b57a30a4ba1283cea8f9e20fa
|
||||
@ -1,55 +0,0 @@
|
||||
---
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
repositories:
|
||||
- repo: "https://gitlab.com/redhat/centos-stream/tests/python.git"
|
||||
dest: "python"
|
||||
- repo: "https://gitlab.com/redhat/centos-stream/rpms/pyproject-rpm-macros.git"
|
||||
dest: "pyproject-rpm-macros"
|
||||
tests:
|
||||
- smoke27:
|
||||
dir: python/smoke
|
||||
run: VERSION=2.7 METHOD=virtualenv ./venv.sh
|
||||
- smoke35:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.5 METHOD=virtualenv ./venv.sh
|
||||
- smoke36:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.6 METHOD=virtualenv ./venv.sh
|
||||
- smoke37:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.7 METHOD=virtualenv ./venv.sh
|
||||
- smoke38:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.8 METHOD=virtualenv ./venv.sh
|
||||
- smoke39:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.9 METHOD=virtualenv ./venv.sh
|
||||
- smoke310:
|
||||
dir: python/smoke
|
||||
run: VERSION=3.10 METHOD=virtualenv ./venv.sh
|
||||
- pyproject_pytest:
|
||||
dir: pyproject-rpm-macros/tests
|
||||
run: ./mocktest.sh python-pytest
|
||||
- pyproject_pluggy:
|
||||
dir: pyproject-rpm-macros/tests
|
||||
run: ./mocktest.sh python-pluggy
|
||||
required_packages:
|
||||
- gcc
|
||||
- virtualenv
|
||||
- python2.7
|
||||
- python3.5
|
||||
- python3.6
|
||||
- python3.7
|
||||
- python3.8
|
||||
- python3.9
|
||||
- python3.10
|
||||
- python2-devel
|
||||
- python3-devel
|
||||
- python3-tox
|
||||
- mock
|
||||
- rpmdevtools
|
||||
- rpm-build
|
||||
Loading…
Reference in New Issue
Block a user