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

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

.gitignore

@@ -2,3 +2,10 @@
 /tox-1.6.1.tar.gz
 /tox-1.7.1.tar.gz
 /tox-1.8.1.tar.gz
+/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
+/tox-3.5.3.tar.gz

py39.patch

@@ -0,0 +1,13 @@
+diff --git a/src/tox/constants.py b/src/tox/constants.py
+index bd21562..e1b7c3f 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)]
+     PYPY_VERSION_TUPLES = [(2, 7), (3, 5)]
+     OTHER_PYTHON_INTERPRETERS = ["jython"]
+     DEFAULT_FACTORS = _construct_default_factors(

python-tox-Fix-command-expansion-and-parsing.patch

@@ -1,93 +0,0 @@
-# HG changeset patch
-# User Clark Boylan <clark.boylan@gmail.com>
-# Date 1391830704 28800
-# Node ID 62fe57a8fd3f8f44be8957e59846387d2f505227
-# Parent  b0360a54ab368ef428c7f83601ba6b64f6fec64f
-Fix command expansion and parsing.
-
-Tox testenv commands are parsed to expand variable substitutions and
-construct the argv list that will be passed to exec. Prior to this
-commit this parsing ate quotes surrounding variables and treated
-multiword variables as single argv items. Neither behavior was correct.
-To fix this create the expanded command before handing it off to shlex
-to do the tokenization of the argv list. Doing the parsing in this
-order ensures it is correct.
-
-diff --git a/tests/test_config.py b/tests/test_config.py
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -278,7 +278,7 @@
-         #    "reader.getargvlist('section', 'key1')")
-         assert reader.getargvlist('section', 'key1') == []
-         x = reader.getargvlist("section", "key2")
--        assert x == [["cmd1", "with space", "grr"],
-+        assert x == [["cmd1", "with", "space", "grr"],
-                      ["cmd2", "grr"]]
- 
-     def test_argvlist_windows_escaping(self, tmpdir, newconfig):
-@@ -304,7 +304,7 @@
-         #    "reader.getargvlist('section', 'key1')")
-         assert reader.getargvlist('section', 'key1') == []
-         x = reader.getargvlist("section", "key2")
--        assert x == [["cmd1", "with space", "grr"]]
-+        assert x == [["cmd1", "with", "space", "grr"]]
- 
- 
-     def test_argvlist_quoting_in_command(self, tmpdir, newconfig):
-diff --git a/tox/_config.py b/tox/_config.py
---- a/tox/_config.py
-+++ b/tox/_config.py
-@@ -527,30 +527,35 @@
-     def _processcommand(self, command):
-         posargs = getattr(self, "posargs", None)
- 
--        # special treat posargs which might contain multiple arguments
--        # in their defaults
-+        # Iterate through each word of the command substituting as
-+        # appropriate to construct the new command string. This
-+        # string is then broken up into exec argv components using
-+        # shlex.
-         newcommand = ""
-         for word in CommandParser(command).words():
--            if word.startswith("{posargs:") and word.endswith("}"):
-+            if word == "{posargs}" or word == "[]":
-                 if posargs:
--                    word = "{posargs}"
-+                    newcommand += " ".join(posargs)
-+                continue
-+            elif word.startswith("{posargs:") and word.endswith("}"):
-+                if posargs:
-+                    newcommand += " ".join(posargs)
-+                    continue
-                 else:
-                     word = word[9:-1]
--            newcommand += word
-+            new_arg = ""
-+            new_word = self._replace(word)
-+            new_word = self._replace(new_word)
-+            new_arg += new_word
-+            newcommand += new_arg
- 
--        # now we can properly parse the command
--        argv = []
--        for arg in shlex.split(newcommand):
--            if arg in ('[]', "{posargs}"):
--                if posargs:
--                    argv.extend(posargs)
--                continue
--            new_arg = ""
--            for word in CommandParser(arg).words():
--                new_word = self._replace(word)
--                new_word = self._replace(new_word)
--                new_arg += new_word
--            argv.append(new_arg)
-+        # Construct shlex object that will not escape any values,
-+        # use all values as is in argv.
-+        shlexer = shlex.shlex(newcommand, posix=True)
-+        shlexer.whitespace_split = True
-+        shlexer.escape = ''
-+        shlexer.commenters = ''
-+        argv = list(shlexer)
-         return argv
- 
-     def getargv(self, section, name, default=None, replace=True):

python-tox.spec

@@ -1,8 +1,3 @@
-%if 0%{?fedora} > 12
-# virtualenv for python3 is missing
-%global with_python3 0
-%endif
-
 # 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)
@@ -10,122 +5,236 @@
 
 
 %global pypiname tox
-Name:           python-tox
-Version:        1.8.1
-Release:        1%{?dist}
+Name:           python-%{pypiname}
+Version:        3.5.3
+Release:        4%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
 License:        GPLv2+ and MIT
-URL:            http://codespeak.net/tox
-Source0:        http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
+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
+Patch1:         py39.patch
 
 BuildArch:      noarch
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
-Requires:  python-py
-Requires:  python-virtualenv >= 1.11.2
-# required for check
-%if 0%{?fedora}
-BuildRequires:  python-py
-BuildRequires:  pytest
-BuildRequires:  python-virtualenv >= 1.11.2
-%endif
 
 %description
-Tox as is a generic virtualenv management and test command line tool you 
+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 
+ - checking your package installs correctly with different Python versions
    and interpreters
- - running your tests in each of the environments, configuring your test tool 
+ - running your tests in each of the environments, configuring your test tool
    of choice
- - acting as a frontend to Continuous Integration servers, greatly reducing 
+ - acting as a frontend to Continuous Integration servers, greatly reducing
    boilerplate and merging CI and shell-based testing.
 
-%if 0%{?with_python3}
+
 %package -n python3-%{pypiname}
-Summary:        Virtualenv-based automation of test activities
-Requires:       python3-py
-# python3-virtualenv is rhbz#537246
-Requires:       python3-virtualenv
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{pypiname}}
+Provides:       %{pypiname} = %{version}-%{release}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-setuptools_scm
+
+# Recommend "all the Pythons"
+# Why? Tox exists to enable developers to test libraries against various Python
+# versions, with just "dnf install tox" and a config file.
+# See: https://developer.fedoraproject.org/tech/languages/python/python-installation.html#using-virtualenv
+# Tox itself runs on the system python3 (i.e. %%{python3_version},
+# however it launches other Python versions as subprocesses.
+# It recommends all Python versions it supports. (This is an exception to
+# the rule that Fedora packages may not require the alternative interpreters.)
+Recommends:     python27
+Recommends:     python34
+Recommends:     python35
+Recommends:     python36
+Recommends:     python37
+Recommends:     python38
+Recommends:     python39
+Recommends:     pypy-devel
+Recommends:     pypy3-devel
+Recommends:     python2-devel
+Recommends:     python3-devel
+
+# Replace the python2 version
+Obsoletes:      python2-tox < 2.9.1-4
+
+%if %{with internet}
+# for tests
 BuildRequires:  python3-py
 BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-mock
+BuildRequires:  python3-pytest-xdist
 BuildRequires:  python3-virtualenv
-
-%description -n python3-%{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.
 %endif
 
+%?python_enable_dependency_generator
+
+%description -n python3-%{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.
+
 %prep
-%setup -q -n %{pypiname}-%{version}
+%autosetup -p1 -n %{pypiname}-%{version}
 
 # remove bundled egg-info
 rm -rf %{pypiname}.egg-info
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif
-
-
 %build
-%{__python} setup.py build
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
-%endif # with_python3
+%py3_build
 
 
 %install
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
-mv %{buildroot}%{_bindir}/tox %{buildroot}%{_bindir}/python3-tox
-mv %{buildroot}%{_bindir}/tox-quickstart %{buildroot}%{_bindir}/python3-tox-quickstart
-popd
-%endif # with_python3
-
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%py3_install
 
 # if internet connection available, run tests
 %if %{with internet}
 %check
-# python 2.7: fedora 17, fedora 18
-# python 3.2: fedora 17
-# python 3.3: fedora 18
-
-# el6: buildrequirements missing
-#%if 0%{?rhel}==6
-#TOXENV=py26 %{__python} setup.py test
-#%endif
-
-%if 0%{?fedora}>=17 
-TOXENV=py27 %{__python} setup.py test
+# there will be failures like
+#    ModuleNotFoundError: tox
+# or InterpreterNotFound: python
+# We juggle the environment variables as much as we can, but it's not perfect.
+# To workaround this:
+#    1. build --without internet
+#    2. install the new python3-tox
+#    3. build --with internet
+mkdir .path
+ln -s %{__python3} .path/python
+ln -s /usr/bin/easy_install-%{python3_version} .path/easy_install
+ln -s /usr/bin/pytest-%{python3_version} .path/pytest
+ln -s /usr/bin/pip3 .path/pip
+export PATH=$(pwd)/.path:%{buildroot}%{_bindir}:$PATH
+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_alwayscopy"
+rm -rf .path
 %endif
 
-%endif
- 
-%files
-%doc LICENSE ISSUES.txt doc
+%files -n python3-%{pypiname}
 %{_bindir}/%{pypiname}
 %{_bindir}/%{pypiname}-quickstart
-%{python_sitelib}/%{pypiname}
-%{python_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
-
+%{python3_sitelib}/%{pypiname}
+%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* 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 Feb 15 2019 Lumír Balhar <lbalhar@redhat.com> - 3.5.3-3
+- Recommend Python 3.8
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 22 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.5.3-1
+- Upgrade to 3.5.3 version
+
+* 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
+
+* Sun Apr 09 2017 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-8
+- Recommend the devel subpackages of Pythons (so tox works with extension modules)
+
+* Tue Feb 14 2017 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-7
+- Recommend python36
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-5
+- Rebuild for Python 3.6
+
+* Mon Oct 10 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-4
+- Recommend "all the Pythons"
+
+* Thu Aug 11 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-3
+- /usr/bin/tox is Python3
+- Python 2 subpackage is python2-tox
+- Run the tests also on Python 3
+- Update Source URL and URL
+- Use modern macros
+- Get rid of Fedora 17 checks
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Mon Feb 29 2016 Matthias Runge <mrunge@redhat.com> - 2.3.1-1
+- update to 2.3.1
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Nov 12 2015 Kalev Lember <klember@redhat.com> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Tue Aug 25 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-2
+- add requirement: python-pluggy
+
+* Tue Aug 18 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-1
+- update to 2.1.1
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Tue Dec 16 2014 Matthias Runge <mrunge@redhat.com> - 1.8.1-1
 - update to 1.8.1
 

sources

@@ -1 +1 @@
-c4423cc6512932b37e5b0d1faa87bef2  tox-1.8.1.tar.gz
+SHA512 (tox-3.5.3.tar.gz) = d93fd44af6e62d0ceb756894f2b6d3fc695f7a797069422c93a1d82eb62542227f900ed19505cb6f77345a9c03fd1080f017638fa623d985c4f6ded48aad5545

tests/tests.yml

@@ -0,0 +1,44 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/python.git"
+      dest: "python"
+    tests:
+    - smoke27:
+        dir: python/smoke
+        run: VERSION=2.7 METHOD=virtualenv ./venv.sh
+    - smoke34:
+        dir: python/smoke
+        run: VERSION=3.4 ./venv.sh
+    - smoke35:
+        dir: python/smoke
+        run: VERSION=3.5 ./venv.sh
+    - smoke36:
+        dir: python/smoke
+        run: VERSION=3.6 ./venv.sh
+    - smoke37:
+        dir: python/smoke
+        run: VERSION=3.7 ./venv.sh
+    - smoke38:
+        dir: python/smoke
+        run: VERSION=3.8 ./venv.sh
+    - smoke39:
+        dir: python/smoke
+        run: VERSION=3.9 ./venv.sh
+    required_packages:
+    - gcc
+    - virtualenv
+    - python27
+    - python34
+    - python35
+    - python36
+    - python37
+    - python38
+    - python39
+    - python2-devel
+    - python3-devel
+    - python3-tox