Update to 3.24.4

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

.gitignore

@@ -17,3 +17,8 @@
 /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

provision-backports.patch

@@ -1,235 +0,0 @@
-diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py
-index c21222c..93805ba 100644
---- a/src/tox/config/__init__.py
-+++ b/src/tox/config/__init__.py
-@@ -2,6 +2,7 @@ from __future__ import print_function
- 
- import argparse
- import itertools
-+import json
- import os
- import random
- import re
-@@ -538,6 +539,16 @@ def tox_addoption(parser):
-         action="store_true",
-         help="override alwayscopy setting to True in all envs",
-     )
-+    parser.add_argument(
-+        "--no-provision",
-+        action="store",
-+        nargs="?",
-+        default=False,
-+        const=True,
-+        metavar="REQUIRES_JSON",
-+        help="do not perform provision, but fail and if a path was provided "
-+        "write provision metadata as JSON to it",
-+    )
- 
-     cli_skip_missing_interpreter(parser)
-     parser.add_argument("--workdir", metavar="PATH", help="tox working directory")
-@@ -1234,11 +1245,11 @@ class ParseIni(object):
-             feedback("--devenv requires only a single -e", sysexit=True)
- 
-     def handle_provision(self, config, reader):
--        requires_list = reader.getlist("requires")
-+        config.requires = reader.getlist("requires")
-         config.minversion = reader.getstring("minversion", None)
-         config.provision_tox_env = name = reader.getstring("provision_tox_env", ".tox")
-         min_version = "tox >= {}".format(config.minversion or tox.__version__)
--        deps = self.ensure_requires_satisfied(config, requires_list, min_version)
-+        deps = self.ensure_requires_satisfied(config, config.requires, min_version)
-         if config.run_provision:
-             section_name = "testenv:{}".format(name)
-             if section_name not in self._cfg.sections:
-@@ -1254,8 +1265,8 @@ class ParseIni(object):
-         # raise on unknown args
-         self.config._parser.parse_cli(args=self.config.args, strict=True)
- 
--    @staticmethod
--    def ensure_requires_satisfied(config, requires, min_version):
-+    @classmethod
-+    def ensure_requires_satisfied(cls, config, requires, min_version):
-         missing_requirements = []
-         failed_to_parse = False
-         deps = []
-@@ -1282,12 +1293,33 @@ class ParseIni(object):
-                 missing_requirements.append(str(requirements.Requirement(require)))
-         if failed_to_parse:
-             raise tox.exception.BadRequirement()
-+        if config.option.no_provision and missing_requirements:
-+            msg = "provisioning explicitly disabled within {}, but missing {}"
-+            if config.option.no_provision is not True:  # it's a path
-+                msg += " and wrote to {}"
-+                cls.write_requires_to_json_file(config)
-+            raise tox.exception.Error(
-+                msg.format(sys.executable, missing_requirements, config.option.no_provision)
-+            )
-         if WITHIN_PROVISION and missing_requirements:
-             msg = "break infinite loop provisioning within {} missing {}"
-             raise tox.exception.Error(msg.format(sys.executable, missing_requirements))
-         config.run_provision = bool(len(missing_requirements))
-         return deps
- 
-+    @staticmethod
-+    def write_requires_to_json_file(config):
-+        requires_dict = {
-+            "minversion": config.minversion,
-+            "requires": config.requires,
-+        }
-+        try:
-+            with open(config.option.no_provision, "w", encoding="utf-8") as outfile:
-+                json.dump(requires_dict, outfile, indent=4)
-+        except TypeError:  # Python 2
-+            with open(config.option.no_provision, "w") as outfile:
-+                json.dump(requires_dict, outfile, indent=4, encoding="utf-8")
-+
-     def parse_build_isolation(self, config, reader):
-         config.isolated_build = reader.getbool("isolated_build", False)
-         config.isolated_build_env = reader.getstring("isolated_build_env", ".package")
-diff --git a/tests/unit/session/test_provision.py b/tests/unit/session/test_provision.py
-index aa631c0..710df60 100644
---- a/tests/unit/session/test_provision.py
-+++ b/tests/unit/session/test_provision.py
-@@ -1,5 +1,6 @@
- from __future__ import absolute_import, unicode_literals
- 
-+import json
- import os
- import shutil
- import subprocess
-@@ -42,6 +43,35 @@ def test_provision_min_version_is_requires(newconfig, next_tox_major):
-     assert config.ignore_basepython_conflict is False
- 
- 
-+def test_provision_config_has_minversion_and_requires(newconfig, next_tox_major):
-+    with pytest.raises(MissingRequirement) as context:
-+        newconfig(
-+            [],
-+            """\
-+            [tox]
-+            minversion = {}
-+            requires =
-+                setuptools > 2
-+                pip > 3
-+            """.format(
-+                next_tox_major,
-+            ),
-+        )
-+    config = context.value.config
-+
-+    assert config.run_provision is True
-+    assert config.minversion == next_tox_major
-+    assert config.requires == ["setuptools > 2", "pip > 3"]
-+
-+
-+def test_provision_config_empty_minversion_and_requires(newconfig, next_tox_major):
-+    config = newconfig([], "")
-+
-+    assert config.run_provision is False
-+    assert config.minversion is None
-+    assert config.requires == []
-+
-+
- def test_provision_tox_change_name(newconfig):
-     config = newconfig(
-         [],
-@@ -149,6 +179,99 @@ def test_provision_cli_args_not_ignored_if_provision_false(cmd, initproj):
-     result.assert_fail(is_run_test_env=False)
- 
- 
-+parametrize_json_path = pytest.mark.parametrize("json_path", [None, "missing.json"])
-+
-+
-+@parametrize_json_path
-+def test_provision_does_not_fail_with_no_provision_no_reason(cmd, initproj, json_path):
-+    p = initproj("test-0.1", {"tox.ini": "[tox]"})
-+    result = cmd("--no-provision", *([json_path] if json_path else []))
-+    result.assert_success(is_run_test_env=True)
-+    assert not (p / "missing.json").exists()
-+
-+
-+@parametrize_json_path
-+def test_provision_fails_with_no_provision_next_tox(cmd, initproj, next_tox_major, json_path):
-+    p = initproj(
-+        "test-0.1",
-+        {
-+            "tox.ini": """\
-+                             [tox]
-+                             minversion = {}
-+                             """.format(
-+                next_tox_major,
-+            )
-+        },
-+    )
-+    result = cmd("--no-provision", *([json_path] if json_path else []))
-+    result.assert_fail(is_run_test_env=False)
-+    if json_path:
-+        missing = json.loads((p / json_path).read_text("utf-8"))
-+        assert missing["minversion"] == next_tox_major
-+
-+
-+@parametrize_json_path
-+def test_provision_fails_with_no_provision_missing_requires(cmd, initproj, json_path):
-+    p = initproj(
-+        "test-0.1",
-+        {
-+            "tox.ini": """\
-+                             [tox]
-+                             requires =
-+                                 virtualenv > 99999999
-+                             """
-+        },
-+    )
-+    result = cmd("--no-provision", *([json_path] if json_path else []))
-+    result.assert_fail(is_run_test_env=False)
-+    if json_path:
-+        missing = json.loads((p / json_path).read_text("utf-8"))
-+        assert missing["requires"] == ["virtualenv > 99999999"]
-+
-+
-+@parametrize_json_path
-+def test_provision_does_not_fail_with_satisfied_requires(cmd, initproj, next_tox_major, json_path):
-+    p = initproj(
-+        "test-0.1",
-+        {
-+            "tox.ini": """\
-+                             [tox]
-+                             minversion = 0
-+                             requires =
-+                                 setuptools > 2
-+                                 pip > 3
-+                             """
-+        },
-+    )
-+    result = cmd("--no-provision", *([json_path] if json_path else []))
-+    result.assert_success(is_run_test_env=True)
-+    assert not (p / "missing.json").exists()
-+
-+
-+@parametrize_json_path
-+def test_provision_fails_with_no_provision_combined(cmd, initproj, next_tox_major, json_path):
-+    p = initproj(
-+        "test-0.1",
-+        {
-+            "tox.ini": """\
-+                             [tox]
-+                             minversion = {}
-+                             requires =
-+                                 setuptools > 2
-+                                 pip > 3
-+                             """.format(
-+                next_tox_major,
-+            )
-+        },
-+    )
-+    result = cmd("--no-provision", *([json_path] if json_path else []))
-+    result.assert_fail(is_run_test_env=False)
-+    if json_path:
-+        missing = json.loads((p / json_path).read_text("utf-8"))
-+        assert missing["minversion"] == next_tox_major
-+        assert missing["requires"] == ["setuptools > 2", "pip > 3"]
-+
-+
- @pytest.fixture(scope="session")
- def wheel(tmp_path_factory):
-     """create a wheel for a project"""

python-tox.spec

@@ -1,26 +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.15.2
-Release:        2%{?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}
 
-# Expose tox requires via the config object
-# https://github.com/tox-dev/tox/pull/1919
-# Add --no-provision flag
-# https://github.com/tox-dev/tox/pull/1922
-Patch1:         provision-backports.patch
-
 BuildArch:      noarch
 
 %description
@@ -57,6 +58,7 @@ Recommends:     python3.6
 Recommends:     python3.7
 Recommends:     python3.8
 Recommends:     python3.9
+Recommends:     python3.10
 Recommends:     pypy2-devel
 Recommends:     pypy3-devel
 Recommends:     python2-devel
@@ -68,8 +70,7 @@ 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
@@ -81,7 +82,7 @@ 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
@@ -89,8 +90,13 @@ 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
@@ -123,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}
@@ -155,10 +141,42 @@ rm -rf .path
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
 
 %changelog
-* Thu Mar 18 2021 Miro Hrončok <mhroncok@redhat.com> - 3.15.2-2
+* 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)
 

sources

@@ -1 +1 @@
-SHA512 (tox-3.15.2.tar.gz) = 2a93f8141986d967d090eaf9d327e418e42357028540cb140da6a6430749a4b41e7f82c9ae57378995b7f3be060b7480d770416a6a21583e06b83b7248ceacf8
+SHA512 (tox-3.24.4.tar.gz) = 9fe2256276b83bf3bc55ec1876be41da2ff7217187f4bf8f4d728106f9c63fc59d146de5e424f7a90d28b938d312c175f7c815bfd3a17d329bec9ba4102139fc

tests/tests.yml

@@ -26,13 +26,13 @@
     tests:
     - rpmbuild:
         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: "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
@@ -48,6 +48,9 @@
     - 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
@@ -61,12 +64,12 @@
     - gcc
     - virtualenv
     - python27
-    - python34
     - python35
     - python36
     - python37
     - python38
     - python39
+    - python3.10
     - python2-devel
     - python3-devel
     - python3-tox