diff --git a/.gitignore b/.gitignore index 2e7c886..511c0b6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /six-1.12.0.tar.gz /six-1.14.0.tar.gz /six-1.15.0.tar.gz +/six-1.16.0.tar.gz diff --git a/py310.patch b/py310.patch deleted file mode 100644 index b7a2d09..0000000 --- a/py310.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a6ac88fa03735e94938693c354f28937e1e51ab7 Mon Sep 17 00:00:00 2001 -From: Victor Stinner -Date: Mon, 14 Dec 2020 14:02:29 +0100 -Subject: [PATCH] Port _SixMetaPathImporter to Python 3.10 - -Fixes #341. ---- - six.py | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/six.py b/six.py -index 83f69783..d162d09c 100644 ---- a/six.py -+++ b/six.py -@@ -223,6 +223,12 @@ def get_code(self, fullname): - return None - get_source = get_code # same as get_code - -+ def create_module(self, spec): -+ return self.load_module(spec.name) -+ -+ def exec_module(self, module): -+ pass -+ - _importer = _SixMetaPathImporter(__name__) - - -From 6483c19cb7f6029924bd1ad970dbcf04d3f4189d Mon Sep 17 00:00:00 2001 -From: Brett Cannon -Date: Fri, 26 Mar 2021 16:34:05 -0700 -Subject: [PATCH] Implement find_spec() for _SixMetaPathImporter - ---- - six.py | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/six.py b/six.py -index d162d09c..5e7f0ce4 100644 ---- a/six.py -+++ b/six.py -@@ -71,6 +71,11 @@ def __len__(self): - MAXSIZE = int((1 << 63) - 1) - del X - -+if PY34: -+ from importlib.util import spec_from_loader -+else: -+ spec_from_loader = None -+ - - def _add_doc(func, doc): - """Add documentation to a function.""" -@@ -186,6 +191,11 @@ def find_module(self, fullname, path=None): - return self - return None - -+ def find_spec(self, fullname, path, target=None): -+ if fullname in self.known_modules: -+ return spec_from_loader(fullname, self) -+ return None -+ - def __get_module(self, fullname): - try: - return self.known_modules[fullname] diff --git a/python-six.spec b/python-six.spec index 6df00ea..97cdefe 100644 --- a/python-six.spec +++ b/python-six.spec @@ -4,22 +4,14 @@ %global python_wheelname six-%{version}-py2.py3-none-any.whl Name: python-six -Version: 1.15.0 -Release: 5%{?dist} +Version: 1.16.0 +Release: 1%{?dist} Summary: Python 2 and 3 compatibility utilities License: MIT URL: https://pypi.python.org/pypi/six Source0: %{pypi_source six} -# This patch is combination of two commits (PR's 343 & 352) needed -# to make python-six work with Python 3.10. -# Both of them were already merged into main branch so this can be -# removed once new version is released in upstream. -# https://github.com/benjaminp/six/pull/343 -# https://github.com/benjaminp/six/pull/352 -Patch0: py310.patch - BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel @@ -70,6 +62,10 @@ Summary: %{summary} %changelog +* Mon May 10 2021 Miro Hrončok - 1.16.0-1 +- Update to 1.16.0 +- Fixes: rhbz#1957289 + * Mon Mar 15 2021 Miro Hrončok - 1.15.0-5 - Remove python2-six diff --git a/sources b/sources index 86b80a4..86837eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (six-1.15.0.tar.gz) = eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9 +SHA512 (six-1.16.0.tar.gz) = 076fe31c8f03b0b52ff44346759c7dc8317da0972403b84dfe5898179f55acdba6c78827e0f8a53ff20afe8b76432c6fe0d655a75c24259d9acbaa4d9e8015c0