.gitignore

@@ -1 +1 @@
-SOURCES/six-1.12.0.tar.gz
+SOURCES/six-1.15.0.tar.gz

.python-six.metadata

@@ -1 +1 @@
-1957b44942be21822414f4dde936e6c40b687565 SOURCES/six-1.12.0.tar.gz
+a785c20658b3676333c749436f088394c12b0c26 SOURCES/six-1.15.0.tar.gz

SOURCES/py310.patch

@@ -0,0 +1,27 @@
+From a6ac88fa03735e94938693c354f28937e1e51ab7 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+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__)
+ 
+ 

SPECS/python-six.spec

@@ -1,120 +1,113 @@
-%global modname six
-
-# tests are enabled by default, but on Fedora 32+, Python 2 tests are skipped
+# tests are enabled by default
 %bcond_without tests
 
-# python2 is enabled by default, Fedora 32+ exception is anticipated
-%bcond_with python2
+%global python_wheelname six-%{version}-py2.py3-none-any.whl
 
-%global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl
-
-Name:           python-%{modname}
-Version:        1.12.0
+Name:           python-six
+Version:        1.15.0
 Release:        9%{?dist}
 Summary:        Python 2 and 3 compatibility utilities
 
 License:        MIT
 URL:            https://pypi.python.org/pypi/six
-Source0:        https://files.pythonhosted.org/packages/source/%(n=%{modname}; echo ${n:0:1})/%{modname}/%{modname}-%{version}.tar.gz
+Source0:        %{pypi_source six}
+
+# Backported from upstream PR: https://github.com/benjaminp/six/pull/343
+Patch0:         py310.patch
 
 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
 
-%global _description \
-%%{name} provides simple utilities for wrapping over differences between\
-Python 2 and Python 3.
-
-%description %{_description}
-
-%if %{with python2}
-%package -n python2-%{modname}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{modname}}
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-
-%if %{with tests} && 0%{?fedora} < 32
-BuildRequires:  python2-pytest
-BuildRequires:  python2-tkinter
-%endif
-
-%description -n python2-%{modname} %{_description}
-Python 2 version.
-
-%endif
-
-
-%package -n python%{python3_pkgversion}-%{modname}
-Summary:        %{summary}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-pip
 BuildRequires:  python%{python3_pkgversion}-wheel
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
 
 %if %{with tests}
-BuildRequires:  python%{python3_pkgversion}-pytest
-BuildRequires:  python%{python3_pkgversion}-tkinter
+BuildRequires:  python3-pytest
+BuildRequires:  python3-tkinter
 %endif
 
-%description -n python%{python3_pkgversion}-%{modname} %{_description}
-Python 3 version.
+%global _description %{expand:
+%{name} provides simple utilities for wrapping over differences between
+Python 2 and Python 3.}
+
+%description %{_description}
+
+
+%package -n python%{python3_pkgversion}-six
+Summary:        %{summary}
+
+%description -n python%{python3_pkgversion}-six %{_description}
 
 
 %prep
-%autosetup -n %{modname}-%{version}
+%autosetup -p1 -n six-%{version}
 
 
 %build
-%if %{with python2}
-%py2_build
-%endif
-
 %py3_build_wheel
 
 
 %install
-%if %{with python2}
-%py2_install
-%endif
-
 %py3_install_wheel %{python_wheelname}
 
 %if %{with tests}
 %check
-%if %{with python2} && 0%{?fedora} < 32
-PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -rfsxX test_six.py
-%endif
-PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -rfsxX test_six.py
+%pytest -rfsxX test_six.py
 %endif
 
 
-%if %{with python2}
-%files -n python2-%{modname}
+%files -n python%{python3_pkgversion}-six
 %license LICENSE
 %doc README.rst documentation/index.rst
-%{python2_sitelib}/%{modname}-*.egg-info/
-%{python2_sitelib}/%{modname}.py*
-%endif
-
-%files -n python%{python3_pkgversion}-%{modname}
-%license LICENSE
-%doc README.rst documentation/index.rst
-%{python3_sitelib}/%{modname}-*.dist-info/
-%{python3_sitelib}/%{modname}.py
-%{python3_sitelib}/__pycache__/%{modname}.*
+%{python3_sitelib}/six-*.dist-info/
+%pycached %{python3_sitelib}/six.py
 
 
 %changelog
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.12.0-9
-- Exclude unsupported i686 arch
+* Wed Feb 16 2022 Lukáš Zachar <lzachar@redhat.com> - 1.15.0-9
+- Add gating configuration and simple test
+- Related: rhbz#1950291
 
-* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.12.0-8
-- Adjusted for Python 3.8 module in RHEL 8
+* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.15.0-8
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Related: rhbz#1990421
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.15.0-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.15.0-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 15 2021 Miro Hrončok <mhroncok@redhat.com> - 1.15.0-5
+- Remove python2-six
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 14 2020 Lumír Balhar <lbalhar@redhat.com> - 1.15.0-3
+- Fix compatibility with Python 3.10
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.15.0-1
+- Update to 1.15.0 (#1838702)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.14.0-4
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.14.0-3
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 17 2020 Miro Hrončok <mhroncok@redhat.com> - 1.14.0-1
+- Update to 1.14.0 (#1768982) for Python 3.9 support (#1788494)
+- Drop old obsoletes for platform-python-six
 
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-7
 - Rebuilt for Python 3.8.0rc1 (#1748018)