dev-python/tox: bump to 3.9.0

Also, get rid of the useless setuptools_scm dependency.

Signed-off-by: Virgil Dupras <vdupras@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 3473320fa563e074aa3a777cbb6c840d4e7bbf3b..35303ce439de0db446643b067ac9d280f0407d6d 100644 (file)
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,3 @@
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-DIST tox-3.7.0.tar.gz 267854 BLAKE2B 9b32e6010f47d00e5ad81b31a8b9e809162ec9438c8a98df3e86c37692a3040bc0158d106f5698cdb6e240be54db80ce8b3c4c8710732f85d9eedfe1a0814852 SHA512 7e12f3407c1ad51ae5839bdd7907c7b05654f3a145270573326fbe3903d22c6e63a930c242ecaf1eae746043da090703e48ead7e27973294711f45077217ed37
+DIST tox-3.9.0.tar.gz 282134 BLAKE2B ee2702d3a6392eaaeb9371cfc4823c3cc46731aff2c44eb652958d10c2e337bcc2922480770e7049fca28c06668f436a47c4ef112a8177133566a12ce6394a81 SHA512 7cac28d4f8bc4c30f827a9770da43a06b19fdfec1251c079a380e161851d51df0d395d8b6499100c387a6d711352447a8fd2c14e1ebe6d3a9a0b08ca6c3464ee

diff --git a/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch b/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch
new file mode 100644 (file)
index 0000000..f6f78af
--- /dev/null
+++ b/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch
@@ -0,0 +1,30 @@
+diff --git a/setup.py b/setup.py
+index 73f2540..8d6f3c3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,19 +1,13 @@
+ # -*- coding: utf-8 -*-
+-import textwrap
++import os
+ 
+ from setuptools import setup
+ 
+-setup(
+-    use_scm_version={
+-        "write_to": "src/tox/version.py",
+-        "write_to_template": textwrap.dedent(
+-            """
+-             # coding: utf-8
+-             from __future__ import unicode_literals
++VERSION = os.environ['PV']
++with open('src/tox/version.py', 'wt') as fp:
++    fp.write("__version__ = u'{}'".format(VERSION))
+ 
+-             __version__ = {version!r}
+-             """
+-        ).lstrip(),
+-    },
++setup(
++    version=VERSION,
+     package_dir={"": "src"},
+ )

diff --git a/dev-python/tox/tox-3.7.0.ebuild b/dev-python/tox/tox-3.9.0.ebuild
similarity index 85%
rename from dev-python/tox/tox-3.7.0.ebuild
rename to dev-python/tox/tox-3.9.0.ebuild
index 4a32bc04c9768272ff07af3df58db11ba5bed855..9f26a3b878d94047a72d494f3d3daf47930336b0 100644 (file)
--- a/dev-python/tox/tox-3.7.0.ebuild
+++ b/dev-python/tox/tox-3.9.0.ebuild
@@ -28,16 +28,19 @@ RDEPEND="
        dev-python/toml[${PYTHON_USEDEP}]
        dev-python/virtualenv[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-       >=dev-python/setuptools_scm-2[${PYTHON_USEDEP}]
+       dev-python/setuptools[${PYTHON_USEDEP}]
        test? (
                >=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+               dev-python/pathlib2[${PYTHON_USEDEP}]
                >=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-               <dev-python/pytest-4.0
                <dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
        )"
 
 # for some reason, --deselect doesn't work in tox's tests
-PATCHES=( "${FILESDIR}/${PN}-3.7.0-skip-broken-tests.patch" )
+PATCHES=(
+       "${FILESDIR}/${PN}-3.7.0-skip-broken-tests.patch"
+       "${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
 
 python_test() {
        pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"