Fedora CI: Workaround No group usr/bin/virtualenv available

See https://pagure.io/fedora-ci/general/issue/31

.gitignore

@@ -9,6 +9,3 @@
 /tox-3.0.0.tar.gz
 /tox-3.4.0.tar.gz
 /tox-3.5.3.tar.gz
-/tox-3.9.0.tar.gz
-/tox-3.13.1.tar.gz
-/tox-3.13.2.tar.gz

1368.patch

@@ -1,112 +0,0 @@
-From dab74691cd1cd55621c943fc869f8ee821746ff6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 8 Jul 2019 19:08:17 +0200
-Subject: [PATCH] Use importlib.metadata from the standard library on Python
- 3.8+
-
-Fixes https://github.com/tox-dev/tox/issues/1367
----
- CONTRIBUTORS                            | 1 +
- setup.cfg                               | 2 +-
- src/tox/config/__init__.py              | 2 +-
- src/tox/session/commands/show_config.py | 2 +-
- src/tox/util/stdlib.py                  | 5 +++++
- tox.ini                                 | 2 +-
- 6 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/CONTRIBUTORS b/CONTRIBUTORS
-index 39d848b..ad0168f 100644
---- a/CONTRIBUTORS
-+++ b/CONTRIBUTORS
-@@ -58,6 +58,7 @@ Mattieu Agopian
- Michael Manganiello
- Mickaël Schoentgen
- Mikhail Kyshtymov
-+Miro Hrončok
- Monty Taylor
- Morgan Fainberg
- Nick Douma
-diff --git a/setup.cfg b/setup.cfg
-index 3950ea3..c2bb1c2 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -37,7 +37,7 @@ classifiers =
- packages = find:
- python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
- install_requires = 
--	importlib-metadata >= 0.12, <1
-+	importlib-metadata >= 0.12, <1;python_version<"3.8"
- 	packaging >= 14
- 	pluggy >= 0.12.0, <1
- 	py >= 1.4.17, <2
-diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py
-index c1a3239..849b31f 100644
---- a/src/tox/config/__init__.py
-+++ b/src/tox/config/__init__.py
-@@ -15,7 +15,6 @@ from fnmatch import fnmatchcase
- from subprocess import list2cmdline
- from threading import Thread
- 
--import importlib_metadata
- import pluggy
- import py
- import toml
-@@ -34,6 +33,7 @@ from tox.reporter import (
-     verbosity1,
- )
- from tox.util.path import ensure_empty_dir
-+from tox.util.stdlib import importlib_metadata
- 
- from .parallel import ENV_VAR_KEY as PARALLEL_ENV_VAR_KEY
- from .parallel import add_parallel_config, add_parallel_flags
-diff --git a/src/tox/session/commands/show_config.py b/src/tox/session/commands/show_config.py
-index 11c5cf2..efb713a 100644
---- a/src/tox/session/commands/show_config.py
-+++ b/src/tox/session/commands/show_config.py
-@@ -1,13 +1,13 @@
- import sys
- from collections import OrderedDict
- 
--import importlib_metadata
- from packaging.requirements import Requirement
- from packaging.utils import canonicalize_name
- from six import StringIO
- from six.moves import configparser
- 
- from tox import reporter
-+from tox.util.stdlib import importlib_metadata
- 
- DO_NOT_SHOW_CONFIG_ATTRIBUTES = (
-     "interpreters",
-diff --git a/src/tox/util/stdlib.py b/src/tox/util/stdlib.py
-index 0b25859..5f687b7 100644
---- a/src/tox/util/stdlib.py
-+++ b/src/tox/util/stdlib.py
-@@ -3,6 +3,11 @@ import threading
- from contextlib import contextmanager
- from tempfile import TemporaryFile
- 
-+if sys.version_info >= (3, 8):
-+    from importlib import metadata as importlib_metadata  # noqa
-+else:
-+    import importlib_metadata  # noqa
-+
- 
- def is_main_thread():
-     """returns true if we are within the main thread"""
-diff --git a/tox.ini b/tox.ini
-index fa5b321..fcb1418 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -139,7 +139,7 @@ include_trailing_comma = True
- force_grid_wrap = 0
- line_length = 99
- known_first_party = tox,tests
--known_third_party = apiclient,docutils,filelock,flaky,freezegun,git,httplib2,importlib_metadata,oauth2client,packaging,pathlib2,pluggy,py,pytest,setuptools,six,sphinx,toml
-+known_third_party = apiclient,docutils,filelock,flaky,freezegun,git,httplib2,oauth2client,packaging,pathlib2,pluggy,py,pytest,setuptools,six,sphinx,toml
- 
- [testenv:release]
- description = do a release, required posarg of the version number
--- 
-2.21.0
-

py39.patch

@@ -1,11 +1,11 @@
 diff --git a/src/tox/constants.py b/src/tox/constants.py
-index 8dcc86b..1c90e47 100644
+index bd21562..e1b7c3f 100644
 --- a/src/tox/constants.py
 +++ b/src/tox/constants.py
-@@ -30,7 +30,7 @@ def _construct_default_factors(cpython_versions, pypy_versions, other_interprete
- 
+@@ -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)]
      PYPY_VERSION_TUPLES = [(2, 7), (3, 5)]

python-tox.spec

@@ -1,23 +1,19 @@
 # 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). Example:
-# $ mock --enable-network --with internet <SRPM>
+# for sanity checks before committing)
 %bcond_with internet
 
 
-%global pypi_name tox
-Name:           python-%{pypi_name}
-Version:        3.13.2
-Release:        3%{?dist}
+%global pypiname tox
+Name:           python-%{pypiname}
+Version:        3.5.3
+Release:        4%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
-License:        MIT
-URL:            https://tox.readthedocs.io/
-Source0:        %{pypi_source}
-
-# Use importlib.metadata from stdlib on Python 3.8
-# Rebased from https://github.com/tox-dev/tox/pull/1368
-Patch0:         1368.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
 
 # Run py39 env with Python 3.9
 # https://bugzilla.redhat.com/show_bug.cgi?id=1798929
@@ -37,10 +33,10 @@ can use for:
    boilerplate and merging CI and shell-based testing.
 
 
-%package -n python3-%{pypi_name}
+%package -n python3-%{pypiname}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
-Provides:       %{pypi_name} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{pypiname}}
+Provides:       %{pypiname} = %{version}-%{release}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools_scm
@@ -60,7 +56,7 @@ Recommends:     python36
 Recommends:     python37
 Recommends:     python38
 Recommends:     python39
-Recommends:     pypy2-devel
+Recommends:     pypy-devel
 Recommends:     pypy3-devel
 Recommends:     python2-devel
 Recommends:     python3-devel
@@ -68,34 +64,18 @@ Recommends:     python3-devel
 # Replace the python2 version
 Obsoletes:      python2-tox < 2.9.1-4
 
-# Replace detox (no longer supported, functionality is now in tox)
-Obsoletes:      python3-detox < 0.19-5
-
 %if %{with internet}
 # for tests
-BuildRequires:  python3-filelock
-BuildRequires:  python3-flaky
-BuildRequires:  python3-freezegun
-BuildRequires:  python3-packaging
-BuildRequires:  python3-pathlib2
-BuildRequires:  python3-pip
-BuildRequires:  python3-pluggy >= 0.12
-BuildRequires:  python3-psutil
 BuildRequires:  python3-py
 BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-mock
-#BuildRequires:  python3-pytest-randomly -- not packaged
 BuildRequires:  python3-pytest-xdist
-BuildRequires:  python3-toml
 BuildRequires:  python3-virtualenv
-BuildRequires:  python3-wheel
-BuildRequires:  (python3-importlib-metadata if python3 < 3.8)
-BuildRequires:  /usr/bin/git
 %endif
 
 %?python_enable_dependency_generator
 
-%description -n python3-%{pypi_name}
+%description -n python3-%{pypiname}
 Tox as is a generic virtualenv management and test command line tool you
 can use for:
 
@@ -107,10 +87,10 @@ can use for:
    boilerplate and merging CI and shell-based testing.
 
 %prep
-%autosetup -p1 -n %{pypi_name}-%{version}
+%autosetup -p1 -n %{pypiname}-%{version}
 
 # remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+rm -rf %{pypiname}.egg-info
 
 %build
 %py3_build
@@ -140,32 +120,21 @@ export PYTHONPATH=%{buildroot}%{python3_sitelib}
 export TOXENV=py%{python3_version_nodots}
 export TOX_TESTENV_PASSENV="PATH TOX_TESTENV_PASSENV"
 # TODO figure out why PEP517/518 tests and test_provision_cli_args_ignore won't pass
-pytest-3 -n auto -k "not test_verbose_isolated_build and not test_dist_exists_version_change and not test_provision_cli_args_ignore"
+pytest-3 -n auto -k "not test_verbose_isolated_build and not test_dist_exists_version_change and not test_alwayscopy"
 rm -rf .path
 %endif
 
-%files -n python3-%{pypi_name}
-%{_bindir}/%{pypi_name}
-%{_bindir}/%{pypi_name}-quickstart
-%{python3_sitelib}/%{pypi_name}/
-%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
+%files -n python3-%{pypiname}
+%{_bindir}/%{pypiname}
+%{_bindir}/%{pypiname}-quickstart
+%{python3_sitelib}/%{pypiname}
+%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
 
 %changelog
-* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-3
+* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.5.3-4
 - Fix invocation with Python 3.9 (#1798929)
 - Recommend Python 3.9
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jul 08 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-1
-- Update to 3.13.2 (#1699032)
-
-* Tue Apr 30 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0-1
-- Update to 3.9.0
-- Obsolete detox
-- License is MIT
-
 * Fri Feb 15 2019 Lumír Balhar <lbalhar@redhat.com> - 3.5.3-3
 - Recommend Python 3.8
 

sources

@@ -1 +1 @@
-SHA512 (tox-3.13.2.tar.gz) = 06c92c803bef7c2dd3796ecc869d78dc4d3044e62688bcf529b7c6b8330532aab30dcc44425fc226886a35d8227225db5e3f2435a469e90af7ad440231abbc35
+SHA512 (tox-3.5.3.tar.gz) = d93fd44af6e62d0ceb756894f2b6d3fc695f7a797069422c93a1d82eb62542227f900ed19505cb6f77345a9c03fd1080f017638fa623d985c4f6ded48aad5545

tests/tests.yml

@@ -1,12 +1,4 @@
 ---
-- hosts: localhost
-  tags:
-    - classic
-  tasks:
-    - dnf:
-        name: "*"
-        state: latest
-
 - hosts: localhost
   roles:
   - role: standard-test-basic