From 064e82cc7c301271f6a49bf5b80e9350ff4cadec Mon Sep 17 00:00:00 2001 From: matoro Date: Fri, 19 Jul 2019 19:19:38 +0000 Subject: [PATCH] dev-python/{pluggy,pytest,packaging}: fix circular deps This was my fault for not reading the complete setup.py for =dev-python/pytest-5.0.1 https://github.com/pytest-dev/pytest/blob/5.0.1/setup.py --- dev-python/pluggy/Manifest | 3 +++ dev-python/pluggy/metadata.xml | 15 +++++++++++++ dev-python/pluggy/pluggy-0.12.0.ebuild | 29 ++++++++++++++++++++++++++ dev-python/pytest/Manifest | 2 +- dev-python/pytest/pytest-5.0.1.ebuild | 8 ++++--- 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 dev-python/pluggy/Manifest create mode 100644 dev-python/pluggy/metadata.xml create mode 100644 dev-python/pluggy/pluggy-0.12.0.ebuild diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest new file mode 100644 index 000000000..f7b2b6e45 --- /dev/null +++ b/dev-python/pluggy/Manifest @@ -0,0 +1,3 @@ +DIST pluggy-0.12.0.tar.gz 57658 BLAKE2B 53c35f16fa73ffd115c7988032593e925e538f1a49a36a0db4db406b013f6f68f293ebbe3673243748d5707e72520192775e59cb8e1bbe4f9a448a5f3ba64651 SHA512 a3a64caefc797334b73b0614e467613b99909037a62dcbfbb0cf917788ee8d12af4f43d7c371634ac6eb6f32a5aa08e51aa8179e70b5998d4d055cd7f535129f +EBUILD pluggy-0.12.0.ebuild 906 BLAKE2B 580cca6fc2c56e6e36d78bd2fe3d6d47d8fc0a4feed3aced8aa831fcee21a666972b24fd2994322c808e0daeb1255c67530577dfbc0d9df0ce57c5403c676b3c SHA512 7bd96d6b385c8157c2cbdc30897d8c4a2c253074805864512cd1f9ffb555d774e0fd3805d9a0577d5708e4e60ca22b4f71c02b872d4513f52fecdd413679041b +MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50 diff --git a/dev-python/pluggy/metadata.xml b/dev-python/pluggy/metadata.xml new file mode 100644 index 000000000..972236293 --- /dev/null +++ b/dev-python/pluggy/metadata.xml @@ -0,0 +1,15 @@ + + + + + python@gentoo.org + Python + + + pluggy + + holger@merlinux.eu + Holger Krekel + + + diff --git a/dev-python/pluggy/pluggy-0.12.0.ebuild b/dev-python/pluggy/pluggy-0.12.0.ebuild new file mode 100644 index 000000000..d15f164fc --- /dev/null +++ b/dev-python/pluggy/pluggy-0.12.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="plugin and hook calling mechanisms for python" +HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools_scm[${PYTHON_USEDEP}] + >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + )" + +python_test() { + PYTHONPATH="${BUILD_DIR}/lib" pytest -v || die "tests failed with ${EPYTHON}" +} diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index 0a6a00e67..780c966de 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -5,5 +5,5 @@ DIST pytest-5.0.0.tar.gz 947536 BLAKE2B d52f9f87f57f777891be892784d2c259418fb8df DIST pytest-5.0.1.tar.gz 949744 BLAKE2B c949f0fb6bc0d1430ec7c780537f8aee8ca1ebea5f89035d882434236c6af7d431a610774dbafa93552406e38852627a9f949a6f9198a792de9371efadb4f6ff SHA512 92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db EBUILD pytest-4.6.3.ebuild 2054 BLAKE2B 4421866033a8df11789934608511a116c06faa5aa1a2e50f450e4f13882657f65b5ad00ab4e3903da2bdbdc03a5852f668df16d68993aa85cbe68a83f3edfe97 SHA512 334e9e67905b4a5c934f4f43fd38b555547583a3321f95e51c4046e03f22b00052fa958d8e6360af437937ceccbd672fb7b8a337ed3bcfc4668065a2f132ff84 EBUILD pytest-5.0.0.ebuild 2054 BLAKE2B 4421866033a8df11789934608511a116c06faa5aa1a2e50f450e4f13882657f65b5ad00ab4e3903da2bdbdc03a5852f668df16d68993aa85cbe68a83f3edfe97 SHA512 334e9e67905b4a5c934f4f43fd38b555547583a3321f95e51c4046e03f22b00052fa958d8e6360af437937ceccbd672fb7b8a337ed3bcfc4668065a2f132ff84 -EBUILD pytest-5.0.1.ebuild 2094 BLAKE2B 79473f696de134fd3455abda4bbff40223ac17b5969b6f4b819af2438f899a3e7ee54b8d2a01fe33468c25650637c70ec17893964e4cbf84471ddfbd41c69596 SHA512 eaffd19779ebc04bf4ccc4987dc7bfef36d394f272c85091ac1eb70d7a5a1047fc4dd5108f289adb7d20dd580255599b9f145fdc001fb5c9dcefe866a8ffc1c5 +EBUILD pytest-5.0.1.ebuild 2203 BLAKE2B 525897147d20731b1bce81035ee67594534f92079d42087929d71b2264c70e2490ef9dd515b8ea1926c7908488b3ca2488dcb3710f85182dc8968cf11c4e6e18 SHA512 48c7f09974cbb7dd1252f22bd865029a4bf2b70d4fb4965a7877a75954f701385046e4f2e566d63c636aa1329d10c47a6116297588a94d7c70f953b9316236db MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f diff --git a/dev-python/pytest/pytest-5.0.1.ebuild b/dev-python/pytest/pytest-5.0.1.ebuild index cee86c3f7..a878f8f0b 100644 --- a/dev-python/pytest/pytest-5.0.1.ebuild +++ b/dev-python/pytest/pytest-5.0.1.ebuild @@ -25,11 +25,11 @@ RDEPEND=" >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 ) - >=dev-python/pluggy-0.11[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/pathlib2-2.2.0[${PYTHON_USEDEP}]' python2_7 python3_5 ) + >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] =dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}] >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] - >=dev-python/setuptools-40[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/wcwidth[${PYTHON_USEDEP}] @@ -37,6 +37,8 @@ RDEPEND=" # flake cause a number of tests to fail DEPEND="${RDEPEND} + >=dev-python/setuptools-40[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}] test? ( >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}]