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

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

.gitignore

@@ -9,16 +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
-/tox-3.14.3.tar.gz
-/tox-3.14.6.tar.gz
-/tox-3.15.0.tar.gz
-/tox-3.15.1.tar.gz
-/tox-3.15.2.tar.gz
-/tox-3.16.1.tar.gz
-/tox-3.17.0.tar.gz
-/tox-3.18.0.tar.gz
-/tox-3.19.0.tar.gz
-/tox-3.24.1.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.spec

@@ -1,26 +1,23 @@
-# Tests are disbaled by default, they require:
+# Tests requiring Internet connections are disabled by default
-#  a) tested tox to be installed
+# pass --with internet to run them (e.g. when doing a local rebuild
-#  b) internet connection
+# for sanity checks before committing)
-# To test, do the following:
+%bcond_with internet
-#  1) Build --without tests (the default)
-#     (e.g. fedpkg mockbuild)
-#  2) Install the built package
-#     (e.g. mock install ./results_python-tox/.../python3-tox-...rpm)
-#  3) Build again --with tests (and internet connection)
-#     (e.g. fedpkg mockbuild --enable-network --no-clean-all)
-# The Fedora CI tests do this.
-%bcond_with tests
 
 
-%global pypi_name tox
+%global pypiname tox
-Name:           python-%{pypi_name}
+Name:           python-%{pypiname}
-Version:        3.24.4
+Version:        3.5.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
-License:        MIT
+# file toxbootstrap.py is licensed under MIT License
-URL:            https://tox.readthedocs.io/
+License:        GPLv2+ and MIT
-Source0:        %{pypi_source}
+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
 
@@ -36,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}}
+%{?python_provide:%python_provide python3-%{pypiname}}
-Provides:       %{pypi_name} = %{version}-%{release}
+Provides:       %{pypiname} = %{version}-%{release}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools_scm
@@ -52,14 +49,14 @@ BuildRequires:  python3-setuptools_scm
 # 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:     python2.7
+Recommends:     python27
-Recommends:     python3.5
+Recommends:     python34
-Recommends:     python3.6
+Recommends:     python35
-Recommends:     python3.7
+Recommends:     python36
-Recommends:     python3.8
+Recommends:     python37
-Recommends:     python3.9
+Recommends:     python38
-Recommends:     python3.10
+Recommends:     python39
-Recommends:     pypy2-devel
+Recommends:     pypy-devel
 Recommends:     pypy3-devel
 Recommends:     python2-devel
 Recommends:     python3-devel
@@ -67,41 +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)
+%if %{with internet}
-Obsoletes:      python3-detox < 0.19-5
+# for tests
-
-%if %{with tests}
-BuildRequires:  python3-filelock
-BuildRequires:  python3-flaky
-BuildRequires:  python3-freezegun
-BuildRequires:  python3-packaging
-BuildRequires:  python3-pip
-BuildRequires:  python3-pluggy >= 0.12
-BuildRequires:  python3-poetry
-BuildRequires:  python3-psutil
 BuildRequires:  python3-py
 BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-mock
-BuildRequires:  python3-pytest-randomly
 BuildRequires:  python3-pytest-xdist
-BuildRequires:  python3-toml
 BuildRequires:  python3-virtualenv
-BuildRequires:  python3-wheel
-BuildRequires:  (python3-importlib-metadata if python3 < 3.8)
-BuildRequires:  /usr/bin/gcc
-BuildRequires:  /usr/bin/git
-BuildRequires:  /usr/bin/pip
-BuildRequires:  /usr/bin/poetry
-BuildRequires:  /usr/bin/pytest
-BuildRequires:  /usr/bin/python
-BuildRequires:  libffi-devel
-# The tests only work if the tested tox is installed :(
-BuildRequires:  %{pypi_name} = %{version}-%{release}
 %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:
 
@@ -113,14 +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}
-
-# Pathlib2 was retired in Fedora, instead of unretiring it,
-# it's enough to use pathlib instead.
-find . -type f -name "*.py" -print0 | xargs -0 sed -i "s/pathlib2/pathlib/g"
 
 # remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+rm -rf %{pypiname}.egg-info
 
 %build
 %py3_build
@@ -129,95 +99,42 @@ rm -rf %{pypi_name}.egg-info
 %install
 %py3_install
 
-%if %{with tests}
+# if internet connection available, run tests
+%if %{with internet}
 %check
-%pytest -n auto
+# 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
 
-%files -n python3-%{pypi_name}
+%files -n python3-%{pypiname}
-%{_bindir}/%{pypi_name}
+%{_bindir}/%{pypiname}
-%{_bindir}/%{pypi_name}-quickstart
+%{_bindir}/%{pypiname}-quickstart
-%{python3_sitelib}/%{pypi_name}/
+%{python3_sitelib}/%{pypiname}
-%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
+%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
 
 %changelog
-* Wed Oct 13 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.24.4-1
+* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.5.3-4
-- Update to 3.24.4
-
-* Tue Aug 31 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.3-1
-- Update to 3.24.3
-
-* Tue Aug 03 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-1
-- Update to 3.24.1
-
-* Tue Aug 03 2021 Miro Hrončok <mhroncok@redhat.com> - 3.19.0-3
-- Add Recommends for Python 3.10
-- https://fedoraproject.org/wiki/Changes/Python3.10
-
-* Thu Mar 18 2021 Miro Hrončok <mhroncok@redhat.com> - 3.19.0-2
-- Expose tox requires via the config object
-- Add --no-provision flag
-
-* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 3.19.0-1
-- Update to 3.19.0
-- Fixes rhbz#1861313
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.0-1
-- Update to 3.18.0
-- Fixes rhbz#1859875
-
-* Tue Jul 14 2020 Miro Hrončok <mhroncok@redhat.com> - 3.17.0-1
-- Update to 3.17.0
-- Fixes rhbz#1856985
-
-* Thu Jul 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.16.1-1
-- Update to 3.16.1
-- Fixes rhbz#1851519
-
-* Mon Jun 08 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.2-1
-- Update to 3.15.2 (#1844689)
-
-* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 3.15.1-1
-- Update to 3.15.1 (#1838137)
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.0-2
-- Rebuilt for Python 3.9
-
-* Wed May 13 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.15.0-1
-- Update to 3.15.0
-- Stop recommending Python 3.4
-
-* Thu Mar 19 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.14.6-1
-- Update to 3.14.6
-
-* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.14.3-1
-- Update to 3.14.3 (#1725939)
 - Fix invocation with Python 3.9 (#1798929)
 - Recommend Python 3.9
 
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-3
-- Rebuilt for Python 3.8
-
-* 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.24.4.tar.gz) = 9fe2256276b83bf3bc55ec1876be41da2ff7217187f4bf8f4d728106f9c63fc59d146de5e424f7a90d28b938d312c175f7c815bfd3a17d329bec9ba4102139fc
+SHA512 (tox-3.5.3.tar.gz) = d93fd44af6e62d0ceb756894f2b6d3fc695f7a797069422c93a1d82eb62542227f900ed19505cb6f77345a9c03fd1080f017638fa623d985c4f6ded48aad5545

tests/tests.yml

@@ -1,38 +1,19 @@
 ---
 - hosts: localhost
-  tags:
-    - classic
-  tasks:
-    - dnf:
-        name: "*"
-        state: latest
-
-- hosts: localhost
-  tags:
-  - classic
-  pre_tasks:
-  - import_role:
-      name: standard-test-source
-    vars:
-      fetch_only: True
-
   roles:
   - role: standard-test-basic
+    tags:
+    - classic
     repositories:
     - repo: "https://src.fedoraproject.org/tests/python.git"
       dest: "python"
-    - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git"
-      dest: "pyproject-rpm-macros"
     tests:
-    - rpmbuild:
-        dir: .
-        run: "dnf -y build-dep --define '_with_tests 1' {{ tenv_workdir }}/python-tox.spec && rpmbuild --define '_sourcedir {{ tenv_workdir }}' --with tests -ba {{ tenv_workdir }}/python-tox.spec"
     - smoke27:
         dir: python/smoke
         run: VERSION=2.7 METHOD=virtualenv ./venv.sh
-    - smoke34_optional:
+    - smoke34:
         dir: python/smoke
-        run: VERSION=3.4 INSTALL_OR_SKIP=true ./venv.sh
+        run: VERSION=3.4 ./venv.sh
     - smoke35:
         dir: python/smoke
         run: VERSION=3.5 ./venv.sh
@@ -48,32 +29,16 @@
     - smoke39:
         dir: python/smoke
         run: VERSION=3.9 ./venv.sh
-    - smoke310:
-        dir: python/smoke
-        run: VERSION=3.10 ./venv.sh
-    - pyproject_pytest:
-        dir: pyproject-rpm-macros/tests
-        run: ./mocktest.sh python-pytest
-    - pyproject_pluggy:
-        dir: pyproject-rpm-macros/tests
-        run: ./mocktest.sh python-pluggy
-    - pyproject_openqa_client:
-        dir: pyproject-rpm-macros/tests
-        run: ./mocktest.sh python-openqa_client
     required_packages:
     - gcc
     - virtualenv
     - python27
+    - python34
     - python35
     - python36
     - python37
     - python38
     - python39
-    - python3.10
     - python2-devel
     - python3-devel
     - python3-tox
-    - dnf
-    - mock
-    - rpmdevtools
-    - rpm-build