gentoo resync : 18.11.2019

4 files changed, 11 insertions, 5 deletions

diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index ebe394aafee0..bbfe6759136d 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -2,8 +2,8 @@ DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b96413
 DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0
 DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937289f91f8fead5230ea7082d85275d5d988d655854a36afd48d6b621eaa261ac9a0cd486acc115f0e389fb6828645e8b SHA512 1995754654f8bf509ec7f2186857ba0005dbaea0b1c734f521becb9d022c127e7b36f21da8defd5ec9883de5d0d4afe006f9d152c4cefe6beadf8b878e949eb2
 DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3
-EBUILD setuptools_scm-1.15.6-r1.ebuild 1342 BLAKE2B dfe6b15a2afb8e12c9045349f790094a80089884a7571777038c259e7755bdabc49bacaa268578ab3ca2290de0222004fe747f21c4ff31e8f301b0861d78f442 SHA512 4635b724e86bbd6b962f3f0534cf860dc4cd6051df6752f9fe8625f12ce97b55e3d831f882e4dd3d81ed29199455c223ff42ba1acbef9ff3af7ad15c1d4e4db4
-EBUILD setuptools_scm-1.15.7.ebuild 1466 BLAKE2B 31af4e13002e4e8243066b329bee2ec6dd4e97b7e6d973187ce876baaa75cadff7dff443beda91a9afca6e0f6ca60ae825db3be44ed3990b40e18593a27d06c4 SHA512 a9db37368495c37dc4d48c450bc7f221717c476f0c4ea2504fed51080681d5a6d496dba0f355206c7aa81ce1a970890f0d196e6263533cd5cf947ee401cca0ac
+EBUILD setuptools_scm-1.15.6-r1.ebuild 1369 BLAKE2B 99673d974473af093429b261e0ff50ecd6a80db77b290f90fd9d44a5c7f5598bf5ad029773a2ae9d8f005be57dbf116bf182d2d1e0ea8897d4f22b45a99656ea SHA512 eb1eca65372621b2436af79345a0fae61c5f411fc71dbbdf4be0e6c7c1deb2ca3eaa3a425aa9906459dfcadc3520bd20b7c2fffbdfa0c7811ab1ccaed7951107
+EBUILD setuptools_scm-1.15.7.ebuild 1493 BLAKE2B c4f12f5dc9cf52b1823be2d139ebd6384a1f8a440b6b97f599eff1e03287b9c22905a0f0967dfd22265a2a29b058cfa42c50e8954f3dc8e83dd18cc8beb5bca8 SHA512 e1f32c53488134321f7d9e05dd62bae08ebc667aeea1959f2d0c1934257ce815ee4e904a69d43b39df9147ed32eadb082499094026c83a2925002eb19946416a
 EBUILD setuptools_scm-3.2.0.ebuild 1294 BLAKE2B d384327842fb368efd7eb63a8e1b55aa92da5f19f5301f11f113337e849316b8ea57392526d8ef4ff8770024fb532cdcf03e1e7460ca90a40b310962f77dad0a SHA512 9fdf138a968c9e46e265fe7203606f9c111e67e5221011ae63a9af51eec629ddbfaea28c9bc0c569cfe540c6ec179661f92a0d65e84e9651bf701f1e961e2e21
-EBUILD setuptools_scm-3.3.1.ebuild 1306 BLAKE2B 806f65e0ddb38a8cfdc8a5ff40c875e1e0945e0614cc185d6c62f6cbaa2cd11318069e5d3347ec70f2e3ad14e6891fc448c6c07168ca0a28c78ac52b9883d4c3 SHA512 9b6a0d91db614c80233cb0dcb38fb797aa3480a34b07d68ea190699900b2005be477dedb0e849596d09828e8df605bbbec91ea3babbf26fb1feeaef02d5b8391
+EBUILD setuptools_scm-3.3.1.ebuild 1445 BLAKE2B 8c65b85340452d78fa35c2f2b2613e674ffc0050956beb1e9ad8ea70fb670c58bad2ecf91c4ebb00c38fa1fc850b009b83f00c79bdc22e10c5040fd32ec96021 SHA512 3503fd1c9ea738340030af82e335fed4bcaf56d07090829d99a9b273e6170338058d7773fa7cad7905d11ce84d2b89453e48ba453a1cae513f8286530608fcf0
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
index ca1408a0c098..7d2537afc106 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="git mercurial test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
index 8cbd32011330..693c850fe6b2 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="git mercurial test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
index a800175d3837..042257c239ef 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -32,13 +32,17 @@ python_prepare_all() {
 	# remove self-dependency
 	sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
 		-e "/__main__/i del sys.path[0]" setup.py || die
+	# incompatible pytest version?
+	sed -i -e '/@pytest.mark.issue/d' \
+		-e 's/, marks=pytest.mark.issue([0-9]*)//' \
+		testing/*.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	PYTHONPATH= distutils_install_for_testing
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+	pytest -v -v -x || die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {