/usr/bin/poetry is not needed for tests, poetry is pip-installed as a build backend

See the relevant change of packaging guidelines:
https://pagure.io/packaging-committee/pull-request/1165

tl;dr If we ever add more flags, we want to remove s here, not all flags.

.gitignore

@@ -1,19 +1,2 @@
-/tox-1.4.2.zip
+/tox-*.tar.gz
-/tox-1.6.1.tar.gz
+/tox-*/
-/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
-/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

python-tox.spec

@@ -1,23 +1,49 @@
-# Tests requiring Internet connections are disabled by default
+# Tests are disbaled by default, they require:
-# pass --with internet to run them (e.g. when doing a local rebuild
+#  a) tested tox to be installed
-# for sanity checks before committing). Example:
+#  b) internet connection
-# $ mock --enable-network --with internet <SRPM>
+# 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 --with tests)
+# The Fedora CI tests do this.
+%bcond_with tests
 
+# Unset -s on python shebang - ensure that extensions installed with pip
+# to user locations are seen and properly loaded
+# Fixes https://bugzilla.redhat.com/2057015
+%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//)
 
-%global pypi_name tox
+Name:           python-tox
-Name:           python-%{pypi_name}
+Version:        3.25.0
-Version:        3.15.2
 Release:        1%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 License:        MIT
 URL:            https://tox.readthedocs.io/
-Source0:        %{pypi_source}
+Source0:        %{pypi_source tox}
 
 BuildArch:      noarch
 
-%description
+BuildRequires:  python3-devel
+BuildRequires:  pyproject-rpm-macros
+
+%if %{with tests}
+BuildRequires:  /usr/bin/gcc
+BuildRequires:  /usr/bin/git
+BuildRequires:  /usr/bin/pip
+BuildRequires:  /usr/bin/pytest
+BuildRequires:  /usr/bin/python
+BuildRequires:  libffi-devel
+# xdist is not used upstream, but we use it to speed up the %%check
+BuildRequires:  python3-pytest-xdist
+# The tests only work if the tested tox is installed :(
+BuildRequires:  tox = %{version}-%{release}
+%endif
+
+%global _description %{expand:
 Tox as is a generic virtualenv management and test command line tool you
 can use for:
 
@@ -26,16 +52,13 @@ can use for:
  - 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.
+   boilerplate and merging CI and shell-based testing.}
+
+%description %_description
 
 
-%package -n python3-%{pypi_name}
+%package -n tox
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
-Provides:       %{pypi_name} = %{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
@@ -46,106 +69,139 @@ BuildRequires:  python3-setuptools_scm
 # 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:     python3.5
 Recommends:     python3.6
 Recommends:     python3.7
 Recommends:     python3.8
 Recommends:     python3.9
+Recommends:     python3.10
 Recommends:     pypy2-devel
 Recommends:     pypy3-devel
 Recommends:     python2-devel
 Recommends:     python3-devel
+# Instead of adding new Pythons here, add `Supplements: tox` to them, see:
+# https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/
 
-# Replace the python2 version
+%py_provides    python3-tox
-Obsoletes:      python2-tox < 2.9.1-4
+# Remove this once Fedora 36 goes EOL:
+Obsoletes:      python3-tox < 3.24.4-2
 
-# Replace detox (no longer supported, functionality is now in tox)
+%description -n tox %_description
-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-poetry
-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/gcc
-BuildRequires:  /usr/bin/git
-BuildRequires:  /usr/bin/poetry
-BuildRequires:  libffi-devel
-%endif
-
-%?python_enable_dependency_generator
-
-%description -n python3-%{pypi_name}
-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
-%autosetup -p1 -n %{pypi_name}-%{version}
+%autosetup -p1 -n tox-%{version}
+
+
+%generate_buildrequires
+%pyproject_buildrequires -r %{?with_tests:-x testing}
 
-# remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
 %build
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files tox
 
-# if internet connection available, run tests
+
-%if %{with internet}
+%if %{with tests}
 %check
-# there will be failures like
+%pytest -n auto
-#    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_provision_cli_args_ignore"
-rm -rf .path
 %endif
 
-%files -n python3-%{pypi_name}
+
-%{_bindir}/%{pypi_name}
+%files -n tox -f %{pyproject_files}
-%{_bindir}/%{pypi_name}-quickstart
+%{_bindir}/tox
-%{python3_sitelib}/%{pypi_name}/
+%{_bindir}/tox-quickstart
-%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
+
 
 %changelog
+* Mon May 09 2022 Miro Hrončok <mhroncok@redhat.com> - 3.25.0-1
+- Update to 3.25.0
+
+* Tue Feb 22 2022 Rich Megginson <rmeggins@redhat.com> - 3.24.5-2
+- Remove -s flag from tox shebang, make tox see user-installed plugins
+- Fixes: rhbz#2057015
+
+* Tue Jan 25 2022 Miro Hrončok <mhroncok@redhat.com> - 3.24.5-1
+- Update to 3.24.5
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Dec 13 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.4-2
+- Always BuildRequire runtime dependencies to avoid non-installable builds
+- Remove no longer needed obsoletes of python3-detox
+
+* Wed Oct 13 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.24.4-1
+- Update to 3.24.4
+
+* Tue Aug 31 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.3-1
+- Update to 3.24.3
+
+* Wed Aug 04 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-2
+- Obsolete newer versions of python3-tox
+
+* Tue Aug 03 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-1
+- Update to 3.24.1
+
+* Mon Aug 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-2
+- Remove Recommends Python 3.5
+- Add Recommends for Python 3.10
+- https://fedoraproject.org/wiki/Changes/RetirePython3.5
+- https://fedoraproject.org/wiki/Changes/Python3.10
+
+* Mon Jul 26 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-1
+- Update to 3.24.0
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 3.23.0-3
+- Rebuilt for Python 3.10
+
+* Tue Mar 30 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-2
+- Allow building with setuptools_scm 6+
+
+* Wed Mar 17 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-1
+- Update to 3.23.0
+
+* Tue Feb 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.4-1
+- Update to 3.21.4
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 08 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.0-2
+- Rename the installable package to "tox"
+
+* Fri Jan 08 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.0-1
+- Update to 3.21.0
+
+* Mon Sep 07 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.20.0-1
+- Update to 3.20.0
+- Fixes rhbz#1874601
+
+* 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)
 

sources

@@ -1 +1 @@
-SHA512 (tox-3.15.2.tar.gz) = 2a93f8141986d967d090eaf9d327e418e42357028540cb140da6a6430749a4b41e7f82c9ae57378995b7f3be060b7480d770416a6a21583e06b83b7248ceacf8
+SHA512 (tox-3.25.0.tar.gz) = d98ed9f589c751ddc187618caf509fbc64e99f1b5eafeb9cbd919d94d10e15a55331658121efabac53ef07adeb71af15da8be86fc4f35688a8f9b93bf3e723d1

tests/all_supplementing_pythons.py

@@ -0,0 +1,88 @@
+#!/usr/bin/python3
+"""
+Several packages with various Python interpreters *Supplement* tox.
+*Supplements* is a reverse dependency to *Recommends*.
+
+See https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/
+
+This script:
+
+ 1) figures out all packages in the enabled repositories supplementing tox
+ 2) ensures there is a venv.sh test for each of them in tests.yml
+
+That way, when we change tox (update, patch, etc.),
+we will always test it with all Pythons that supplement it.
+"""
+
+import shlex
+import subprocess
+import sys
+import yaml
+
+
+def parse_python_test_arg(command):
+    tokens = shlex.split(command)
+    for token in tokens:
+        if token.startswith('PYTHON='):
+            return token.removeprefix('PYTHON=')
+    # only check VERSION if PYTHON was not found
+    for token in tokens:
+        if token.startswith('VERSION='):
+            return 'python' + token.removeprefix('VERSION=')
+    raise RuntimeError(f'Could not determine the Python version from `{command}`')
+
+
+# First, construct a set of various Pythons we test, e.g. {python3.10, python3.7, pypy3.6, ...}
+tested_pythons = set()
+with open('tests.yml') as f:
+    tests_yml = yaml.safe_load(f)
+# this nested structure access is quite fragile,
+# but at least it should fail the test if we reach to a wrong place
+for test in tests_yml[-1]['roles'][0]['tests']:
+    for value in test.values():
+        run = value['run']
+        if run.endswith('./venv.sh'):
+            tested_pythons.add(parse_python_test_arg(run))
+print('Tested Pythons found in tests.yml:', file=sys.stderr)
+for python in sorted(tested_pythons):
+    print('    ', python, file=sys.stderr)
+
+
+# Get all packages that supplement tox,
+# no repo explicitly specified means we use the enabled repos on the CI system which should be what we want
+repoquery_result = subprocess.check_output(['dnf', 'repoquery', '--whatsupplements', 'tox'], text=True)
+supplementing_pkgs = set(repoquery_result.splitlines())
+
+
+# It gets quite tricky, since packages like "pypy" can supplement tox, we get a set of provides for all of them
+supplementing_pkgs_provides = {}
+for nvra in supplementing_pkgs:
+    repoquery_result = subprocess.check_output(['dnf', '-q', 'repoquery', '--provides', nvra], text=True)
+    provides = set(repoquery_result.splitlines())
+    unversioned_provides = {provide.split(' ')[0] for provide in provides}
+    supplementing_pkgs_provides[nvra.rsplit('-', 2)[0]] = unversioned_provides
+
+
+# We use this hack to treat -devel and -libs packages as if they were not such
+def normalize_name(pkgname):
+    for suffix in '-devel', '-libs':
+        if pkgname.endswith(suffix):
+            return pkgname.removesuffix(suffix)
+    return pkgname
+
+
+# Now, for each package that supplements tox, we check if there is a tested Python that *is* it
+exit_code = 0
+for pkg, provides in supplementing_pkgs_provides.items():
+    if normalize_name(pkg) in tested_pythons:
+        print(f'{pkg} is tested', file=sys.stderr)
+        continue
+    for provide in provides:
+        if normalize_name(provide) in tested_pythons:
+            print(f'{pkg} is tested (via {provide})', file=sys.stderr)
+            break
+    else:
+        print(f'{pkg} is NOT tested', file=sys.stderr)
+        exit_code = 1
+
+sys.exit(exit_code)

tests/tests.yml

@@ -24,18 +24,18 @@
     - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git"
       dest: "pyproject-rpm-macros"
     tests:
-    - rpmbuild:
+    - mock_with_tests:
         dir: .
-        run: "dnf -y build-dep --define '_with_internet 1' {{ tenv_workdir }}/python-tox.spec && rpmbuild --define '_sourcedir {{ tenv_workdir }}' --with internet -ba {{ tenv_workdir }}/python-tox.spec"
+        run: pyproject-rpm-macros/tests/mocktest.sh python-tox --enable-network --with tests
+    - all_supplementing_pythons:
+        dir: tests
+        run: ./all_supplementing_pythons.py
     - smoke27:
         dir: python/smoke
         run: VERSION=2.7 METHOD=virtualenv ./venv.sh
-    - smoke34:
+    - smoke35_optional:
         dir: python/smoke
-        run: VERSION=3.4 ./venv.sh
+        run: VERSION=3.5 INSTALL_OR_SKIP=true ./venv.sh
-    - smoke35:
-        dir: python/smoke
-        run: VERSION=3.5 ./venv.sh
     - smoke36:
         dir: python/smoke
         run: VERSION=3.6 ./venv.sh
@@ -48,6 +48,21 @@
     - smoke39:
         dir: python/smoke
         run: VERSION=3.9 ./venv.sh
+    - smoke310:
+        dir: python/smoke
+        run: VERSION=3.10 ./venv.sh
+    - smoke311:
+        dir: python/smoke
+        run: VERSION=3.11 ./venv.sh
+    - smoke_pypy37:
+        dir: python/smoke
+        run: PYTHON=pypy3.7 VERSION=3.7 ./venv.sh
+    - smoke_pypy38:
+        dir: python/smoke
+        run: PYTHON=pypy3.8 VERSION=3.8 ./venv.sh
+    - smoke_pypy39:
+        dir: python/smoke
+        run: PYTHON=pypy3.9 VERSION=3.9 ./venv.sh
     - pyproject_pytest:
         dir: pyproject-rpm-macros/tests
         run: ./mocktest.sh python-pytest
@@ -60,17 +75,21 @@
     required_packages:
     - gcc
     - virtualenv
-    - python27
+    - python2.7
-    - python34
+    - python3.6
-    - python35
+    - python3.7
-    - python36
+    - python3.8
-    - python37
+    - python3.9
-    - python38
+    - python3.10
-    - python39
+    - python3.11
     - python2-devel
     - python3-devel
+    - pypy3.7-devel
+    - pypy3.8-devel
+    - pypy3.9-devel
     - python3-tox
     - dnf
     - mock
     - rpmdevtools
     - rpm-build
+    - python3-pyyaml