.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,2 +1 @@
-/six-*.tar.gz
-/six-*/
+SOURCES/six-1.12.0.tar.gz

.python-six.metadata

@@ -0,0 +1 @@
+1957b44942be21822414f4dde936e6c40b687565 SOURCES/six-1.12.0.tar.gz

SPECS/python-six.spec

@@ -1,150 +1,120 @@
-# tests are enabled by default
+%global modname six
+
+# tests are enabled by default, but on Fedora 32+, Python 2 tests are skipped
 %bcond_without tests
 
-Name:           python-six
-Version:        1.16.0
-Release:        16%{?dist}
+# python2 is enabled by default, Fedora 32+ exception is anticipated
+%bcond_with python2
+
+%global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl
+
+Name:           python-%{modname}
+Version:        1.12.0
+Release:        9%{?dist}
 Summary:        Python 2 and 3 compatibility utilities
 
-# SPDX
 License:        MIT
-URL:            https://github.com/benjaminp/six
-Source0:        %{pypi_source six}
-
-# tkinter.tix was removed from Python 3.13, skip the test
-# https://github.com/benjaminp/six/pull/377
-Patch:          tkinter.tix-was-removed-from-Python-3.13.patch
+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
 
 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:  pyproject-rpm-macros
+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
 %endif
 
-%global _description %{expand:
-Six is a Python 2 and 3 compatibility library. It provides utility functions
-for smoothing over the differences between the Python versions with the goal
-of writing Python code that is compatible on both Python versions.}
-
-%description %{_description}
-
-
-%package -n python%{python3_pkgversion}-six
-Summary:        %{summary}
-
-%description -n python%{python3_pkgversion}-six %{_description}
+%description -n python%{python3_pkgversion}-%{modname} %{_description}
+Python 3 version.
 
 
 %prep
-%autosetup -p1 -n six-%{version}
-
-
-%generate_buildrequires
-%pyproject_buildrequires -r
+%autosetup -n %{modname}-%{version}
 
 
 %build
-%pyproject_wheel
+%if %{with python2}
+%py2_build
+%endif
+
+%py3_build_wheel
 
 
 %install
-%pyproject_install
-%pyproject_save_files six
+%if %{with python2}
+%py2_install
+%endif
 
+%py3_install_wheel %{python_wheelname}
 
 %if %{with tests}
 %check
-%pytest
+%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
 %endif
 
 
-%files -n python%{python3_pkgversion}-six -f %{pyproject_files}
+%if %{with python2}
+%files -n python2-%{modname}
 %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}.*
 
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.16.0-16
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.12.0-9
+- Exclude unsupported i686 arch
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.16.0-15
-- Bump release for June 2024 mass rebuild
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 1.16.0-11
-- Rebuilt for Python 3.12
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.16.0-10
-- Bootstrap for Python 3.12
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.16.0-7
-- Rebuilt for Python 3.11
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.16.0-6
-- Bootstrap for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.16.0-3
-- Rebuilt for Python 3.10
-
-* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1.16.0-2
-- Bootstrap for Python 3.10
-
-* Mon May 10 2021 Miro Hrončok <mhroncok@redhat.com> - 1.16.0-1
-- Update to 1.16.0
-- Fixes: rhbz#1957289
-
-* 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
+* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.12.0-8
+- Adjusted for Python 3.8 module in RHEL 8
 
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-7
 - Rebuilt for Python 3.8.0rc1 (#1748018)

gating.yaml

@@ -1,5 +0,0 @@
---- !Policy
-
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans.fmf

@@ -1,11 +0,0 @@
-discover:
-  - name: Smoke tests
-    how: shell
-    tests:
-    - name: import works
-      test: python3 -c 'import six'
-      require:
-      - python3-six
-      duration: 1m
-execute:
-  how: tmt

sources

@@ -1 +0,0 @@
-SHA512 (six-1.16.0.tar.gz) = 076fe31c8f03b0b52ff44346759c7dc8317da0972403b84dfe5898179f55acdba6c78827e0f8a53ff20afe8b76432c6fe0d655a75c24259d9acbaa4d9e8015c0

tkinter.tix-was-removed-from-Python-3.13.patch

@@ -1,25 +0,0 @@
-From 150328a01168e80a358ffcfca321e9172ddf7680 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 19 Oct 2023 01:13:49 +0200
-Subject: [PATCH] tkinter.tix was removed from Python 3.13, skip the test
-
----
- test_six.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test_six.py b/test_six.py
-index 7b8b03b..1fa8c4c 100644
---- a/test_six.py
-+++ b/test_six.py
-@@ -127,6 +127,8 @@ def test_move_items(item_name):
-         if item_name.startswith("tkinter"):
-             if not have_tkinter:
-                 pytest.skip("requires tkinter")
-+            if item_name == "tkinter_tix" and sys.version_info >= (3, 13):
-+                pytest.skip("tkinter.tix removed from Python 3.13")
-         if item_name.startswith("dbm_gnu") and not have_gdbm:
-             pytest.skip("requires gdbm")
-         raise
--- 
-2.41.0
-