Backport provision related changes needed for future pyproject-rpm-macros changes

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

.gitignore

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

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
-

provision-backports.patch

@@ -0,0 +1,235 @@
+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"""

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

@@ -7,21 +7,19 @@
 
 %global pypi_name tox
 Name:           python-%{pypi_name}
-Version:        3.13.2
+Version:        3.15.2
-Release:        3%{?dist}
+Release:        2%{?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
+# Expose tox requires via the config object
-# Rebased from https://github.com/tox-dev/tox/pull/1368
+# https://github.com/tox-dev/tox/pull/1919
-Patch0:         1368.patch
+# Add --no-provision flag
-
+# https://github.com/tox-dev/tox/pull/1922
-# Run py39 env with Python 3.9
+Patch1:         provision-backports.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1798929
-Patch1:         py39.patch
 
 BuildArch:      noarch
 
@@ -53,13 +51,12 @@ 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:     python2.7
-Recommends:     python34
+Recommends:     python3.5
-Recommends:     python35
+Recommends:     python3.6
-Recommends:     python36
+Recommends:     python3.7
-Recommends:     python37
+Recommends:     python3.8
-Recommends:     python38
+Recommends:     python3.9
-Recommends:     python39
 Recommends:     pypy2-devel
 Recommends:     pypy3-devel
 Recommends:     python2-devel
@@ -77,9 +74,9 @@ 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
@@ -90,7 +87,10 @@ 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
@@ -109,6 +109,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
 
@@ -151,10 +155,40 @@ 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
+* Thu Mar 18 2021 Miro Hrončok <mhroncok@redhat.com> - 3.15.2-2
+- Expose tox requires via the config object
+- Add --no-provision flag
+
+* 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.15.2.tar.gz) = 2a93f8141986d967d090eaf9d327e418e42357028540cb140da6a6430749a4b41e7f82c9ae57378995b7f3be060b7480d770416a6a21583e06b83b7248ceacf8

tests/tests.yml

@@ -8,14 +8,25 @@
         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_internet 1' {{ tenv_workdir }}/python-tox.spec && rpmbuild --define '_sourcedir {{ tenv_workdir }}' --with internet -ba {{ tenv_workdir }}/python-tox.spec"
     - smoke27:
         dir: python/smoke
         run: VERSION=2.7 METHOD=virtualenv ./venv.sh
@@ -37,6 +48,15 @@
     - smoke39:
         dir: python/smoke
         run: VERSION=3.9 ./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
@@ -50,3 +70,7 @@
     - python2-devel
     - python3-devel
     - python3-tox
+    - dnf
+    - mock
+    - rpmdevtools
+    - rpm-build