From bde7ce687abfc9b5cdbea7ad6665d657c09730e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 6 Feb 2020 12:31:58 +0100 Subject: [PATCH] Update to 3.14.3 (#1725939) - Fix invocation with Python 3.9 (#1798929) - Recommend Python 3.9 --- .gitignore | 1 + 1368.patch | 112 ------------------------------------------------ python-tox.spec | 14 +++--- sources | 2 +- 4 files changed, 10 insertions(+), 119 deletions(-) delete mode 100644 1368.patch diff --git a/.gitignore b/.gitignore index 7601d42..b8f76e2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /tox-3.9.0.tar.gz /tox-3.13.1.tar.gz /tox-3.13.2.tar.gz +/tox-3.14.3.tar.gz diff --git a/1368.patch b/1368.patch deleted file mode 100644 index 39e8fb1..0000000 --- a/1368.patch +++ /dev/null @@ -1,112 +0,0 @@ -From dab74691cd1cd55621c943fc869f8ee821746ff6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -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 - diff --git a/python-tox.spec b/python-tox.spec index a363935..9e3d003 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -7,18 +7,14 @@ %global pypi_name tox Name: python-%{pypi_name} -Version: 3.13.2 -Release: 5%{?dist} +Version: 3.14.3 +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 - BuildArch: noarch %description @@ -55,6 +51,7 @@ Recommends: python35 Recommends: python36 Recommends: python37 Recommends: python38 +Recommends: python39 Recommends: pypy2-devel Recommends: pypy3-devel Recommends: python2-devel @@ -146,6 +143,11 @@ rm -rf .path %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/ %changelog +* Thu Feb 06 2020 Miro Hrončok - 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 - 3.13.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index dfa8b66..f01489a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.13.2.tar.gz) = 06c92c803bef7c2dd3796ecc869d78dc4d3044e62688bcf529b7c6b8330532aab30dcc44425fc226886a35d8227225db5e3f2435a469e90af7ad440231abbc35 +SHA512 (tox-3.14.3.tar.gz) = 6e1643b795411a7708670082f993d1aa68d80b2d7881cda46e84254b31724fef21e7d9f23e3775c50b34d13c61a2e50a24305d697c26c2c52211196db3f5f559