From 341cb9cf4b780a5f579af7a68d4e0f6c80d2e539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 6 Feb 2020 12:14:19 +0000
Subject: [PATCH] Fix invocation with Python 3.9 (#1798929)

Backported from Fedora 31:
https://src.fedoraproject.org/rpms/python-tox/c/aa466cd2d67b5ca7e5f4f58d0fbc704b38c97d94?branch=f31

Added 3.10 and 3.11 as well.

With this tox.ini:

    [tox]
    skipsdist = True
    [testenv]
    commands = python -c 'import sys; print(sys.version)'

Before:

    $ tox -e py39
    ...
    3.6.8 (default, Aug 24 2020, 17:57:11)
    ...
      py39: commands succeeded
      congratulations :)

After:

    $ tox -e py39
    ...
    3.9.1 (default, Jan 18 2021, 16:14:01)
    ...
      py39: commands succeeded
      congratulations :)

The Python 3.10+ addition remains untested, as I have no Python 3.10+ build for EL 8 available.
---
 py39.patch      | 13 +++++++++++++
 python-tox.spec | 12 ++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 py39.patch

diff --git a/py39.patch b/py39.patch
new file mode 100644
index 0000000..5bdbd7c
--- /dev/null
+++ b/py39.patch
@@ -0,0 +1,13 @@
+diff --git a/src/tox/constants.py b/src/tox/constants.py
+index bd21562..3b5e57f 100644
+--- a/src/tox/constants.py
++++ b/src/tox/constants.py
+@@ -28,7 +28,7 @@ def _construct_default_factors(cpython_versions, pypy_versions, other_interprete
+ class PYTHON:
+     PY_FACTORS_RE = re.compile("^(?!py$)(py|pypy|jython)([2-9][0-9]?)?$")
+     PY_FACTORS_MAP = {"py": "python", "pypy": "pypy", "jython": "jython"}
+-    CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)]
++    CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9), (3, 10), (3, 11)]
+     PYPY_VERSION_TUPLES = [(2, 7), (3, 5)]
+     OTHER_PYTHON_INTERPRETERS = ["jython"]
+     DEFAULT_FACTORS = _construct_default_factors(
diff --git a/python-tox.spec b/python-tox.spec
index dfdb186..61b5443 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -2,11 +2,16 @@
 
 Name:           python-%{srcname}
 Version:        3.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Virtualenv-based automation of test activities
 License:        MIT
 URL:            https://tox.readthedocs.io
 Source0:        %{pypi_source}
+
+# Run py39 env with Python 3.9
+# https://bugzilla.redhat.com/show_bug.cgi?id=1798929
+Patch1:         py39.patch
+
 BuildArch:      noarch
 
 %description
@@ -46,7 +51,7 @@ can use for:
    boilerplate and merging CI and shell-based testing.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%autosetup -p1 -n %{srcname}-%{version}
 
 # remove bundled egg-info
 rm -rf %{srcname}.egg-info
@@ -65,6 +70,9 @@ rm -rf %{srcname}.egg-info
 %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Tue Jan 19 2021 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-2
+- Fix invocation with Python 3.9 (#1798929)
+
 * Tue Feb 25 2020 Gris Ge <fge@redhat.com> - 3.4.0-1
 - Port to EPEL8