diff options
22 files changed, 15 insertions, 467 deletions
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest index 329175d2b4f2..f14e1048f30e 100644 --- a/dev-python/jsonmerge/Manifest +++ b/dev-python/jsonmerge/Manifest @@ -1,2 +1 @@ -DIST jsonmerge-1.4.0.tar.gz 17953 BLAKE2B 625c38fc83bec73f1bca3a8950ec2ee2294ab7da665f4c3b7d78329e5df8a0ed6ceef723eeb5757463b1d702ecfae4a2fa7580915917a7c621c762b90c257504 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122 DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db diff --git a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild deleted file mode 100644 index eaf6ca230675..000000000000 --- a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Merge a series of JSON documents" -HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]" -DEPEND="${REPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -python_test() { - PYTHONPATH="${PWD}" python -m unittest \ - $(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die -} diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest index fcf55357a123..8a86cfc672a8 100644 --- a/dev-python/jsonpatch/Manifest +++ b/dev-python/jsonpatch/Manifest @@ -1,4 +1 @@ -DIST jsonpatch-1.13.tar.gz 15119 BLAKE2B 70ddb570451ac1f3d218de0f79f0a639eb922ce72084cf3bc7e89a3efedb85c6238293bf59608a51f07c33358dc0488550f982f122e89e2414ddfce26fe08c1f SHA512 23f0c92c2c8834d5e3129e9ba78ece7da2646dd60d5b0522b0f09d83e20057ef7517042e5ee8547804185d3ce23cff394c8fe78df93fad7999fae12cc5467a45 -DIST jsonpatch-1.15.tar.gz 15544 BLAKE2B 1b9facd2a88a997356aeace8ddec9011f4f3c4df812fb157cd22f1210ac2e2502e8b9e18e02ea477c869758cdfc1dd0b6b4c8d76ce59ffdd68d4db14c550b572 SHA512 c5df880764b14a2fb60bb46e319bf006644ce1472d0413cf08ad151cf386e5be9fec197fd9efe0bfc3aa22dadf4078344c11211c1e8a3d5cc3ddcb998795dc91 -DIST jsonpatch-1.21.tar.gz 15208 BLAKE2B 88af93bfd7c317319d958bc3386f9551279af2fa9631c24c49231eb67398fd80f298e26957f232c9705219d4fa7033bb62f98b5d5391f6eb9f53113a1d351876 SHA512 dc902b750241833a68612430f07007080ed56dce8a7a4bdd1c042f944cd6cfdc03f4b422cc6bed6bc3b21ea390c5a281cd08181e27d6b57fc5fb657787c1d740 DIST jsonpatch-1.23.tar.gz 18162 BLAKE2B 86322a4de88d37eb674d28425d3aee4ad3b589c724b124f37f16e8303200c742404512b9c675f5b5eb8d8f7916469ebb7915bf289c8190092bcf48a1cb9ca7a0 SHA512 da612fc043e351087fbda26cd5686743107dafca1223e784626c39113dfb4770647db1420e9ab9eee93d12c608a6e0812f0825229ab092962cfb390b6b1795ed diff --git a/dev-python/jsonpatch/jsonpatch-1.13.ebuild b/dev-python/jsonpatch/jsonpatch-1.13.ebuild deleted file mode 100644 index f4ec5d6600d7..000000000000 --- a/dev-python/jsonpatch/jsonpatch-1.13.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python3_6 ) - -RESTRICT="test" - -inherit distutils-r1 - -DESCRIPTION="Apply JSON-Patches according to - http://tools.ietf.org/html/draft-pbryan-json-patch-04" -HOMEPAGE="https://github.com/stefankoegl/python-json-patch" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${RDEPEND} )" - -python_test() { - "${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}" - "${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}" -} diff --git a/dev-python/jsonpatch/jsonpatch-1.15.ebuild b/dev-python/jsonpatch/jsonpatch-1.15.ebuild deleted file mode 100644 index 1f1c237810f9..000000000000 --- a/dev-python/jsonpatch/jsonpatch-1.15.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python3_6 ) - -RESTRICT="test" - -inherit distutils-r1 - -DESCRIPTION="Apply JSON-Patches according to - http://tools.ietf.org/html/draft-pbryan-json-patch-04" -HOMEPAGE="https://github.com/stefankoegl/python-json-patch" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${RDEPEND} )" - -python_test() { - "${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}" - "${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}" -} diff --git a/dev-python/jsonpatch/jsonpatch-1.21.ebuild b/dev-python/jsonpatch/jsonpatch-1.21.ebuild deleted file mode 100644 index a3c42315c2d4..000000000000 --- a/dev-python/jsonpatch/jsonpatch-1.21.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python3_6 ) - -RESTRICT="test" - -inherit distutils-r1 - -DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04" -HOMEPAGE="https://github.com/stefankoegl/python-json-patch" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${RDEPEND} )" - -python_test() { - "${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}" - "${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}" -} diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest index eb75991d155e..fcaf0117e116 100644 --- a/dev-python/jsonpointer/Manifest +++ b/dev-python/jsonpointer/Manifest @@ -1,2 +1 @@ -DIST jsonpointer-1.10.tar.gz 7577 BLAKE2B b4472cd9ead51fe75f2e53690d4c0378cb6b5dccae240bc1bf264bff9df15bdfab379b1043221e66074e08c3393ecf729e4f95721fcb324fe8b710cd49d7f064 SHA512 b2df5f19b14b670825b18f7da4ca50b089beb2ccbb1c69acfc904eed82b5315ad19940b4aaa8f8504c2fc7d477778d65e31f492dd30ee8b5ba95ccfd0eaeb9b1 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137 diff --git a/dev-python/jsonpointer/jsonpointer-1.10.ebuild b/dev-python/jsonpointer/jsonpointer-1.10.ebuild deleted file mode 100644 index 08366cf2baf7..000000000000 --- a/dev-python/jsonpointer/jsonpointer-1.10.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_6 pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)" -HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -python_test() { - "${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/jsonschema/metadata.xml b/dev-python/jsonschema/metadata.xml index 0ba78538e44e..b833d5ed8a63 100644 --- a/dev-python/jsonschema/metadata.xml +++ b/dev-python/jsonschema/metadata.xml @@ -5,10 +5,15 @@ <email>chutzpah@gentoo.org</email> <name>Patrick McLean</name> </maintainer> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> <longdescription lang="en"> jsonschema is an implementation of JSON Schema (currently in Draft 3) for Python (supporting 2.6+ including Python 3). </longdescription> + <stabilize-allarches/> <upstream> <remote-id type="pypi">jsonschema</remote-id> <remote-id type="github">Julian/jsonschema</remote-id> diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest index 18c6cb40c707..b6e486f6a939 100644 --- a/dev-python/jupyter_client/Manifest +++ b/dev-python/jupyter_client/Manifest @@ -1,4 +1,2 @@ -DIST jupyter_client-5.1.0.tar.gz 265233 BLAKE2B 1f4533e1c6578e61b1a7591889805d5e324a3cd368cb3998131f2047056c87984ae26d83c9de0277aa6f19b61db4c4d9b39083b795e0891ef7d5394949b5fa44 SHA512 eca7adab1f8aae05743c341a257d4ca4338b0838cc3441939dda48229cdfa13b267bdc338b951bc4e6e139d03d26b40a1294140218f84ab800d211f7e0d8bfc7 DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae -DIST jupyter_client-5.2.4.tar.gz 273397 BLAKE2B a63e13fea7bf121cfe0191d702bf5398a72902e075d560ec235eec6c28492a89753a90efe642fc207ab23357e74aac566bbfbeeb7970b765bf53641caa7ac95f SHA512 a8bb322e4cbcfa5ab9ffbcfdbf2e2ea60e7923f415d7574a93866e99c03a8c5b0a11d7c82e9c4c1c69f4da1261563f419877dffd5347294a58a744c445271a53 DIST jupyter_client-5.3.4.tar.gz 275850 BLAKE2B a0884fb6cd2858b3ecf8353c6dc180370a53b4d59f77fdeb33c972c72857650e2e8b64ac5f6c9d223a99f30bb9ad9e06673cfe14b2d79abc0e4363104ffd15c3 SHA512 54b5206c08f5119feb50deb2d815d79a178799ad5c1231a0d03fc950ebbf6cb2f7c3a757024f788d416f808c57aa8476fcfa110f63182314bf2d5cdeb9a006cf diff --git a/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch b/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch deleted file mode 100644 index ff7dcb0f3d4c..000000000000 --- a/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f9bd2643d42b3354b27e64368d8c15cad18101d2 Mon Sep 17 00:00:00 2001 -From: Philipp A <flying-sheep@web.de> -Date: Tue, 8 Aug 2017 17:38:52 +0200 -Subject: [PATCH] Always use setuptools if availabe -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When running `python* setup.py install`, the `jupyter-run` script doesn’t get installed without this. ---- - setup.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 60fa17c..0831f7a 100644 ---- a/setup.py -+++ b/setup.py -@@ -70,6 +70,7 @@ - ], - ) - -+# require setuptools for these cases - if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv): - import setuptools - -@@ -85,7 +86,12 @@ - 'test': ['ipykernel', 'ipython', 'mock', 'pytest'], - } - --if 'setuptools' in sys.modules: -+# always try to use setuptools if available -+try: -+ import setuptools -+except ImportError: -+ pass -+else: - setup_args.update(setuptools_args) - setup_args['entry_points'] = { - 'console_scripts': [ diff --git a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild deleted file mode 100644 index 88438e3011c9..000000000000 --- a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Jupyter protocol implementation and client libraries" -HOMEPAGE="https://jupyter.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/traitlets[${PYTHON_USEDEP}] - dev-python/jupyter_core[${PYTHON_USEDEP}] - >=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/ipykernel[${PYTHON_USEDEP}] - ) - " - -python_test() { - pytest --cov jupyter_client jupyter_client || die -} - -PATCHES=( "${FILESDIR}"/${PN}-5.1.0-setuptools.patch ) diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild index 784a759e2564..4a134529626a 100644 --- a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild +++ b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild deleted file mode 100644 index ab6c45328e01..000000000000 --- a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Jupyter protocol implementation and client libraries" -HOMEPAGE="https://jupyter.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/traitlets[${PYTHON_USEDEP}] - dev-python/jupyter_core[${PYTHON_USEDEP}] - >=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/ipykernel[${PYTHON_USEDEP}] - ) - " - -python_test() { - pytest --cov jupyter_client jupyter_client || die -} diff --git a/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild deleted file mode 100644 index ce3429206f4a..000000000000 --- a/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Jupyter protocol implementation and client libraries" -HOMEPAGE="https://jupyter.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/traitlets[${PYTHON_USEDEP}] - dev-python/jupyter_core[${PYTHON_USEDEP}] - >=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}] - www-servers/tornado[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/ipykernel[${PYTHON_USEDEP}] - ) - " - -python_test() { - pytest -vv jupyter_client || die -} diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml index 53a086c17f50..b7b61012ccff 100644 --- a/dev-python/jupyter_client/metadata.xml +++ b/dev-python/jupyter_client/metadata.xml @@ -11,6 +11,7 @@ kernels. It also provides the jupyter kernelspec entrypoint for installing kernelspecs for use with Jupyter frontends. </longdescription> + <stabilize-allarches/> <upstream> <remote-id type="pypi">jupyter_client</remote-id> </upstream> diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest index ee482030f0d8..4b8519652e5d 100644 --- a/dev-python/jupyter_console/Manifest +++ b/dev-python/jupyter_console/Manifest @@ -1,2 +1 @@ -DIST jupyter_console-5.1.0.tar.gz 26661 BLAKE2B 075035d02fee640ccf9a2a7bd22e5872727380bd54b1fed48bd53f6bee12da8ff3dc5f4ff258d0c03f7260e2b495d8cb313a4b4f49e4eb644f0b15988fe41577 SHA512 208a31886eb58c64541048e1f7ed75fccc888d34177f86dfaf10fb7dcd603130a8b3ecbe23cf4d80a75287b847128425f853715c494d2a7e4b4eed8a31058b5c DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f diff --git a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild deleted file mode 100644 index 23b925e042d5..000000000000 --- a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="A terminal-based console frontend for Jupyter kernels" -HOMEPAGE="https://jupyter.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/jupyter_client[${PYTHON_USEDEP}] - >=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/pexpect[${PYTHON_USEDEP}] - >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] - ) - " - -python_prepare_all() { - # Prevent un-needed download during build - if use doc; then - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/conf.py || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - emake -C docs html - HTML_DOCS=( docs/_build/html/. ) - fi -} - -python_test() { - nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die -} diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest index 18b384b70466..19d101e4e616 100644 --- a/dev-python/jupyter_core/Manifest +++ b/dev-python/jupyter_core/Manifest @@ -1,2 +1 @@ -DIST jupyter_core-4.4.0.tar.gz 63613 BLAKE2B 90b5d6c855786beff0ab780e7a894e1b24f6d6d1c26be6ae8da73e82a87f966f1155498c581314d37db845e293be7bc4d085e03991cdc7adfbba36409541cd5b SHA512 387f7f98f640b85ff0a24f11e1beae5a851d7eb3ba4a423be028940cb018c0d0ddf42ae8a1c397e3e4cafa560d3a5385b39bb8794448c7c010be7f0ddcba8a9e DIST jupyter_core-4.6.1.tar.gz 66693 BLAKE2B f4338a015ac4b3e0a7cd2497a660bfca0deb96ffa2371fa9c72656f8a68b6f80fe5d494be79c8fdccbcb51f3d9122fd7d4b3e36864d38e7da1c5029c6b1aa24d SHA512 baf0c5db4f78a3cee83940ace80b48ba308c47eeafcf584120b8ba82768c15448fb789ec5b9ac8d541cbd1bfdd47a988f79130675c5943a67d3135d428b43cbe diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild deleted file mode 100644 index e142d74680f9..000000000000 --- a/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Core common functionality of Jupyter projects" -HOMEPAGE="https://jupyter.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc test" - -RDEPEND=" - dev-python/traitlets[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-github-alt[${PYTHON_USEDEP}] ) - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/ipython-4.0.1[${PYTHON_USEDEP}] - ) -" - -# tests require installation of jupyter_core, bug #649538 -RESTRICT="test" - -python_prepare_all() { - # Prevent un-needed download during build - if use doc; then - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/conf.py || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - emake -C docs html - HTML_DOCS=( docs/_build/html/. ) - fi -} - -python_test() { - distutils_install_for_testing - cd "${TEST_DIR}"/lib || die - py.test jupyter_core || die -} diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild deleted file mode 100644 index 52f77bd87a11..000000000000 --- a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Core common functionality of Jupyter projects" -HOMEPAGE="https://jupyter.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc test" - -RDEPEND=" - dev-python/traitlets[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - !!<dev-python/jupyter-1.0.0-r1 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-github-alt[${PYTHON_USEDEP}] ) - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/ipython-4.0.1[${PYTHON_USEDEP}] - ) -" - -# tests require installation of jupyter_core, bug #649538 -RESTRICT="test" - -python_prepare_all() { - # Prevent un-needed download during build - if use doc; then - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/conf.py || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - emake -C docs html - HTML_DOCS=( docs/_build/html/. ) - fi -} - -python_test() { - distutils_install_for_testing - cd "${TEST_DIR}"/lib || die - py.test jupyter_core || die -} diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index aacee5ac35a0..77982c9b9c76 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -374,17 +374,15 @@ _python_export() { local d case ${impl} in python2.7) - PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';; - python3.3) - PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';; - python*) - PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; - pypy) - PYTHON_PKG_DEP='>=dev-python/pypy-5:0=';; + PYTHON_PKG_DEP='>=dev-lang/python-2.7.17-r1:2.7';; + python3.6) + PYTHON_PKG_DEP=">=dev-lang/python-3.6.10:3.6";; + python3.7) + PYTHON_PKG_DEP=">=dev-lang/python-3.7.6:3.7";; + python3.8) + PYTHON_PKG_DEP=">=dev-lang/python-3.8.2:3.8";; pypy3) - PYTHON_PKG_DEP='>=dev-python/pypy3-5:0=';; - jython2.7) - PYTHON_PKG_DEP='dev-java/jython:2.7';; + PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.0:0=';; *) die "Invalid implementation: ${impl}" esac |