Compare commits

..

No commits in common. "c8-stream-3.8" and "c8-beta-stream-3.9" have entirely different histories.

4 changed files with 97 additions and 28 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/packaging-19.2.tar.gz
SOURCES/packaging-20.4.tar.gz

View File

@ -1 +1 @@
ae4aeb07c330d623c3d8fa8414c6080d2c9a4192 SOURCES/packaging-19.2.tar.gz
b99fa7af153646722b2d1817bb09906cc5a94bc6 SOURCES/packaging-20.4.tar.gz

51
SOURCES/39a70cce.patch Normal file
View File

@ -0,0 +1,51 @@
From 39a70cce69d9b08cc4d02b225114d556d5b59ada Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Wed, 19 Aug 2020 22:37:34 +0300
Subject: [PATCH] Remove dependency on six to make package lighter (#331)
---
packaging/requirements.py | 8 +++++++-
setup.py | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/packaging/requirements.py b/packaging/requirements.py
index 91f81ed..2226e98 100644
--- a/packaging/requirements.py
+++ b/packaging/requirements.py
@@ -5,16 +5,22 @@
import string
import re
+import sys
from pyparsing import stringStart, stringEnd, originalTextFor, ParseException
from pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
from pyparsing import Literal as L # noqa
-from six.moves.urllib import parse as urlparse
from ._typing import TYPE_CHECKING
from .markers import MARKER_EXPR, Marker
from .specifiers import LegacySpecifier, Specifier, SpecifierSet
+if sys.version_info[0] >= 3:
+ from urllib import parse as urlparse # pragma: no cover
+else: # pragma: no cover
+ import urlparse
+
+
if TYPE_CHECKING: # pragma: no cover
from typing import List
diff --git a/setup.py b/setup.py
index f533a7d..a14d926 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@
author=about["__author__"],
author_email=about["__email__"],
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
- install_requires=["pyparsing>=2.0.2", "six"], # Needed to avoid issue #91
+ install_requires=["pyparsing>=2.0.2"], # Needed to avoid issue #91
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",

View File

@ -1,35 +1,36 @@
%global pypi_name packaging
# Specify --without wheel to prevent building the wheel
%bcond_with wheel
# Specify --without docs to prevent the dependency loop on python-sphinx
# RHEL: Disabled due to missing deps
%bcond_with docs
# Specify --without tests to prevent the dependency loop on python-pytest
# RHEL: Disabled due to missing deps
%bcond_with tests
%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
Name: python-%{pypi_name}
Version: 19.2
Release: 3%{?dist}
Version: 20.4
Release: 4%{?dist}
Summary: Core utilities for Python packages
License: BSD or ASL 2.0
URL: https://github.com/pypa/packaging
Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
Source0: %{pypi_source}
BuildArch: noarch
# Exclude i686 arch. Due to a modularity issue it's being added to the
# x86_64 compose of CRB, but we don't want to ship it at all.
# See: https://projects.engineering.redhat.com/browse/RCM-72605
ExcludeArch: i686
# Remove dependency on six to make package lighter, backported from upstream
Patch1: %{url}/commit/39a70cce.patch
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-pyparsing
BuildRequires: python%{python3_pkgversion}-six
BuildRequires: python%{python3_pkgversion}-rpm-macros
BuildRequires: python%{python3_pkgversion}-pyparsing
%if %{with tests}
BuildRequires: python%{python3_pkgversion}-pytest
BuildRequires: python%{python3_pkgversion}-pretend
@ -38,10 +39,8 @@ BuildRequires: python%{python3_pkgversion}-pretend
BuildRequires: python%{python3_pkgversion}-sphinx
%endif
%if %{with wheel}
BuildRequires: python%{python3_pkgversion}-pip
BuildRequires: python%{python3_pkgversion}-wheel
%endif
%description
python-packaging provides core utilities for Python packages like utilities for
@ -52,10 +51,9 @@ Summary: %{summary}
%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
Requires: python%{python3_pkgversion}-pyparsing
Requires: python%{python3_pkgversion}-six
%description -n python%{python3_pkgversion}-%{pypi_name}
python3-packaging provides core utilities for Python packages like utilities for
python%{python3_pkgversion}-packaging provides core utilities for Python packages like utilities for
dealing with versions, specifiers, markers etc.
%if %{with docs}
@ -67,16 +65,12 @@ Documentation for python-packaging
%endif
%prep
%autosetup -n %{pypi_name}-%{version}
%autosetup -p1 -n %{pypi_name}-%{version}
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
%build
%if %{with wheel}
%py3_build_wheel
%else
%py3_build
%endif
%if %{with docs}
# generate html docs
@ -88,15 +82,11 @@ rm -rf html/_static/fonts/
%endif
%install
%if %{with wheel}
%py3_install_wheel %{python_wheelname}
%else
%py3_install
%endif
%if %{with tests}
%check
%{__python3} -m pytest tests/
%pytest
%endif
%files -n python%{python3_pkgversion}-%{pypi_name}
@ -112,11 +102,39 @@ rm -rf html/_static/fonts/
%endif
%changelog
* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 19.2-3
- Exclude unsupported i686 arch
* Tue Jan 12 2021 Tomas Orsava <torsava@redhat.com> - 20.4-4
- Convert from Fedora to the python39 module in RHEL8
- Resolves: rhbz#1877430
* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 19.2-2
- Adjusted for Python 3.8 module in RHEL 8
* Fri Oct 02 2020 Miro Hrončok <mhroncok@redhat.com> - 20.4-3
- Drop the dependency on six to make the package lighter
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 01 2020 Lumír Balhar <lbalhar@redhat.com> - 20.4-1
- Update to 20.4 (#1838285)
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3-3
- Rebuilt for Python 3.9
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3-2
- Bootstrap for Python 3.9
* Fri Mar 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.3-1
- Update to 20.3 (#1810738)
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 27 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1-1
- Update to 20.1 (#1794865)
* Mon Jan 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.0-2
- Ignore broken tests
* Mon Jan 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.0-1
- Update to 20.0 (#1788012)
* Thu Sep 26 2019 Lumír Balhar <lbalhar@redhat.com> - 19.2-1
- New upstream version 19.2 (bz#1742388)