Update to 3.24.4

Related to https://bugzilla.redhat.com/show_bug.cgi?id=1922495

.gitignore

@@ -12,3 +12,13 @@
 /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

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,13 +0,0 @@
-diff --git a/src/tox/constants.py b/src/tox/constants.py
-index 8dcc86b..1c90e47 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
- 
- class PYTHON:
-     PY_FACTORS_RE = re.compile("^(?!py$)(py|pypy|jython)([2-9][0-9]?)?$")
--    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,28 +1,27 @@
-# 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>
-%bcond_with internet
+# Tests are disbaled by default, they require:
+#  a) tested tox to be installed
+#  b) internet connection
+# To test, do the following:
+#  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
 Name:           python-%{pypi_name}
-Version:        3.13.2
-Release:        3%{?dist}
+Version:        3.24.4
+Release:        1%{?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
-
-# Run py39 env with Python 3.9
-# https://bugzilla.redhat.com/show_bug.cgi?id=1798929
-Patch1:         py39.patch
-
 BuildArch:      noarch
 
 %description
@@ -53,13 +52,13 @@ 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:     python27
-Recommends:     python34
-Recommends:     python35
-Recommends:     python36
-Recommends:     python37
-Recommends:     python38
-Recommends:     python39
+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
@@ -71,26 +70,33 @@ 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
+%if %{with 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-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
@@ -109,6 +115,10 @@ can use for:
 %prep
 %autosetup -p1 -n %{pypi_name}-%{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
 
@@ -119,29 +129,9 @@ rm -rf %{pypi_name}.egg-info
 %install
 %py3_install
 
-# if internet connection available, run tests
-%if %{with internet}
+%if %{with tests}
 %check
-# 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_provision_cli_args_ignore"
-rm -rf .path
+%pytest -n auto
 %endif
 
 %files -n python3-%{pypi_name}
@@ -151,10 +141,72 @@ rm -rf .path
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
 
 %changelog
-* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-3
+* 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
+
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (tox-3.13.2.tar.gz) = 06c92c803bef7c2dd3796ecc869d78dc4d3044e62688bcf529b7c6b8330532aab30dcc44425fc226886a35d8227225db5e3f2435a469e90af7ad440231abbc35
+SHA512 (tox-3.24.4.tar.gz) = 9fe2256276b83bf3bc55ec1876be41da2ff7217187f4bf8f4d728106f9c63fc59d146de5e424f7a90d28b938d312c175f7c815bfd3a17d329bec9ba4102139fc

tests/tests.yml

@@ -8,20 +8,31 @@
         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:
+    - smoke34_optional:
         dir: python/smoke
-        run: VERSION=3.4 ./venv.sh
+        run: VERSION=3.4 INSTALL_OR_SKIP=true ./venv.sh
     - smoke35:
         dir: python/smoke
         run: VERSION=3.5 ./venv.sh
@@ -37,16 +48,32 @@
     - 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