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.

.gitignore

@@ -5,3 +5,6 @@
 /tox-2.1.1.tar.gz
 /tox-2.3.1.tar.gz
 /tox-2.7.0.tar.gz
+/tox-2.9.1.tar.gz
+/tox-3.0.0.tar.gz
+/tox-3.4.0.tar.gz

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(

python-tox.spec

@@ -1,19 +1,17 @@
-# Tests requiring Internet connections are disabled by default
-# pass --with internet to run them (e.g. when doing a local rebuild
-# for sanity checks before committing)
-%bcond_with internet
+%global srcname tox
 
-
-%global pypiname tox
-Name:           python-%{pypiname}
-Version:        2.7.0
-Release:        1%{?dist}
+Name:           python-%{srcname}
+Version:        3.4.0
+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
 
-# file toxbootstrap.py is licensed under MIT License
-License:        GPLv2+ and MIT
-URL:            http://tox.testrun.org/
-Source0:        https://files.pythonhosted.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
 BuildArch:      noarch
 
 %description
@@ -27,66 +25,21 @@ can use for:
  - acting as a frontend to Continuous Integration servers, greatly reducing
    boilerplate and merging CI and shell-based testing.
 
-%package -n     python2-%{pypiname}
+
+%package -n python3-%{srcname}
 Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{pypiname}}
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-Requires:  python2-py
-Requires:  python2-virtualenv >= 1.11.2
-Requires:  python-pluggy
-
-%if %{with internet}
-# for tests
-BuildRequires:  python2-py
-BuildRequires:  python2-pytest
-BuildRequires:  python2-virtualenv >= 1.11.2
-%endif
-
-%description -n python2-%{pypiname}
-Tox as is a generic virtualenv management and test command line tool you
-can use for:
-
- - checking your package installs correctly with different Python versions
-   and interpreters
- - running your tests in each of the environments, configuring your test tool
-   of choice
- - acting as a frontend to Continuous Integration servers, greatly reducing
-   boilerplate and merging CI and shell-based testing.
-
-This package contains just the module you can import from Python 2,
-for the actual command line utility, dnf install tox.
-
-%package -n python3-%{pypiname}
-Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypiname}}
-Provides:       %{pypiname} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{srcname}}
+Provides:       %{srcname} = %{version}-%{release}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-Requires:       python3-py
-Requires:       python3-pluggy
-Requires:       python3-virtualenv
+BuildRequires:  python3-setuptools_scm
 
-# Recommend "all the Pythons"
-Recommends:     python26
-Recommends:     python27
-Recommends:     python33
-Recommends:     python34
-Recommends:     python35
 Recommends:     python36
-Recommends:     pypy-devel
-Recommends:     pypy3-devel
-Recommends:     python2-devel
 Recommends:     python3-devel
 
-%if %{with internet}
-# for tests
-BuildRequires:  python3-py
-BuildRequires:  python3-pytest
-BuildRequires:  python3-virtualenv
-%endif
+%?python_enable_dependency_generator
 
-%description -n python3-%{pypiname}
+%description -n python3-%{srcname}
 Tox as is a generic virtualenv management and test command line tool you
 can use for:
 
@@ -98,41 +51,75 @@ can use for:
    boilerplate and merging CI and shell-based testing.
 
 %prep
-%setup -q -n %{pypiname}-%{version}
+%autosetup -p1 -n %{srcname}-%{version}
 
 # remove bundled egg-info
-rm -rf %{pypiname}.egg-info
+rm -rf %{srcname}.egg-info
 
 %build
-%py2_build
 %py3_build
 
 
 %install
-%py2_install
-rm %{buildroot}%{_bindir}/%{pypiname}*
-
 %py3_install
 
-# if internet connection available, run tests
-%if %{with internet}
-%check
-TOXENV=py27 %{__python2} setup.py test
-TOXENV=py%{python3_version_nodots} %{__python3} setup.py test
-%endif
-
-%files -n python2-%{pypiname}
-%license LICENSE
-%{python2_sitelib}/%{pypiname}
-%{python2_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
-
-%files -n python3-%{pypiname}
-%{_bindir}/%{pypiname}
-%{_bindir}/%{pypiname}-quickstart
-%{python3_sitelib}/%{pypiname}
-%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
+%files -n python3-%{srcname}
+%{_bindir}/%{srcname}
+%{_bindir}/%{srcname}-quickstart
+%{python3_sitelib}/%{srcname}
+%{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
+
+* Mon Nov 19 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.4.0-1
+- Upgrade to 3.4.0 version (#1652657)
+
+* Thu Nov 01 2018 Matthias Runge <mrunge@redhat.com> - 3.0.0-6
+- remove and revert the change to recommend python 2.7 (rhbz#1645025)
+
+* Tue Aug 28 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-4
+- Don't recommend Python 2.6, it doesn't work with tox 3
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-2
+- Rebuilt for Python 3.7
+
+* Mon Jul 02 2018 Matthias Runge <mrunge@redhat.com> - 3.0.0-1
+- upgrade to 3.0.0
+
+* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-7
+- Rebuilt for Python 3.7
+
+* Tue May 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-6
+- Remove the python2 version once again
+- Stop recommending python33 (it's retired)
+
+* Mon May 07 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-5
+- Add python2 back, see #1575667
+
+* Mon Apr 30 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-4
+- Remove the python2 version
+
+* Thu Mar 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-3
+- Switch to automatic dependency generator (also fixes #1556164)
+- Recommend python37
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jan 29 2018 Matthias Runge <mrunge@redhat.com> - 2.9.1-1
+- update to 2.9.1
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Tue Apr 25 2017 Matthias Runge <mrunge@redhat.com> - 2.7.0-1
 - upgrade to 2.7.0
 

sources

@@ -1 +1 @@
-SHA512 (tox-2.7.0.tar.gz) = 96088a9f77e8b994d920a8c9907a0fa50d5e0fe918e5a67673d4c30810642be2872283810d1d8b5ae9cc311605236b64343248485c4d4067b54c7b6d9f31a4b4
+SHA512 (tox-3.4.0.tar.gz) = c14364dffac50bece66f15545325d7912459e49979b37b48ff399610517a43a10a4c005f4ca5ec9481fb4140803a18be64f94838610e07d1e7a4b3e5df2a7d87

tests/tests.yml

@@ -0,0 +1,21 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/python.git"
+      dest: "python"
+    tests:
+    - smoke36:
+        dir: python/smoke
+        run: VERSION=3.6 ./venv.sh
+    - smoke38:
+        dir: python/smoke
+        run: VERSION=3.8 ./venv.sh
+    required_packages:
+    - gcc
+    - python36-devel
+    - python38-devel
+    - python3-tox