#12 Update to 3.13.2 (#1699032)
Merged 2 months ago by churchyard. Opened 3 months ago by churchyard.
rpms/ churchyard/python-tox 3.13.1  into  master

file modified
+2

@@ -10,3 +10,5 @@ 

  /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

file added
+112

@@ -0,0 +1,112 @@ 

+ 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

+ 

file modified
+29 -17

@@ -5,15 +5,20 @@ 

  %bcond_with internet

  

  

- %global pypiname tox

- Name:           python-%{pypiname}

- Version:        3.9.0

+ %global pypi_name tox

+ Name:           python-%{pypi_name}

+ Version:        3.13.2

  Release:        1%{?dist}

  Summary:        Virtualenv-based automation of test activities

  

  License:        MIT

  URL:            http://tox.testrun.org/

- Source0:        https://files.pythonhosted.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz

+ 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

@@ -28,10 +33,10 @@ 

     boilerplate and merging CI and shell-based testing.

  

  

- %package -n python3-%{pypiname}

+ %package -n python3-%{pypi_name}

  Summary:        %{summary}

- %{?python_provide:%python_provide python3-%{pypiname}}

- Provides:       %{pypiname} = %{version}-%{release}

+ %{?python_provide:%python_provide python3-%{pypi_name}}

+ Provides:       %{pypi_name} = %{version}-%{release}

  BuildRequires:  python3-devel

  BuildRequires:  python3-setuptools

  BuildRequires:  python3-setuptools_scm

@@ -66,8 +71,10 @@ 

  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-psutil

  BuildRequires:  python3-py

  BuildRequires:  python3-pytest

@@ -76,12 +83,14 @@ 

  BuildRequires:  python3-pytest-xdist

  BuildRequires:  python3-toml

  BuildRequires:  python3-virtualenv

+ BuildRequires:  python3-wheel

+ BuildRequires:  (python3-importlib-metadata if python3 < 3.8)

  BuildRequires:  /usr/bin/git

  %endif

  

  %?python_enable_dependency_generator

  

- %description -n python3-%{pypiname}

+ %description -n python3-%{pypi_name}

  Tox as is a generic virtualenv management and test command line tool you

  can use for:

  

@@ -93,10 +102,10 @@ 

     boilerplate and merging CI and shell-based testing.

  

  %prep

- %setup -q -n %{pypiname}-%{version}

+ %autosetup -p1 -n %{pypi_name}-%{version}

  

  # remove bundled egg-info

- rm -rf %{pypiname}.egg-info

+ rm -rf %{pypi_name}.egg-info

  

  %build

  %py3_build

@@ -125,18 +134,21 @@ 

  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_tox_parallel_build_safe won't pass

- pytest-3 -n auto -k "not test_verbose_isolated_build and not test_tox_parallel_build_safe and not test_dist_exists_version_change"

+ # 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-%{pypiname}

- %{_bindir}/%{pypiname}

- %{_bindir}/%{pypiname}-quickstart

- %{python3_sitelib}/%{pypiname}

- %{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info

+ %files -n python3-%{pypi_name}

+ %{_bindir}/%{pypi_name}

+ %{_bindir}/%{pypi_name}-quickstart

+ %{python3_sitelib}/%{pypi_name}/

+ %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/

  

  %changelog

+ * Mon Jul 08 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-1

+ - Update to 3.13.2 (#1699032)

+ 

  * Tue Apr 30 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0-1

  - Update to 3.9.0

  - Obsolete detox

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (tox-3.9.0.tar.gz) = 7cac28d4f8bc4c30f827a9770da43a06b19fdfec1251c079a380e161851d51df0d395d8b6499100c387a6d711352447a8fd2c14e1ebe6d3a9a0b08ca6c3464ee

+ SHA512 (tox-3.13.2.tar.gz) = 06c92c803bef7c2dd3796ecc869d78dc4d3044e62688bcf529b7c6b8330532aab30dcc44425fc226886a35d8227225db5e3f2435a469e90af7ad440231abbc35

file modified
+8

@@ -1,5 +1,13 @@ 

  ---

  - hosts: localhost

+   tags:

+     - classic

+   tasks:

+     - dnf:

+         name: "*"

+         state: latest

+ 

+ - hosts: localhost

    roles:

    - role: standard-test-basic

      tags:

There are missing deps, do not merge yet, see bugzillas blocking https://bugzilla.redhat.com/show_bug.cgi?id=1699032

rebased onto ee77f68

2 months ago

Rebased to 3.13.2, dependencies should be ready, also working on https://github.com/tox-dev/tox/pull/1368

I see some test failures locally :(

Metadata Update from @churchyard:
- Request assigned

2 months ago

Test failures fixed. Will add the commit for importlib.metadata and merge if it works on 3.8 as well.

rebased onto 4e85c05

2 months ago

1 new commit added

  • Make sure directories in %files stay that way
2 months ago

Pull-Request has been merged by churchyard

2 months ago