From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- dev-python/nbdime/Manifest | 3 -- .../files/nbdime-2.0.0-remove-bdist_egg-hack.patch | 36 -------------- dev-python/nbdime/nbdime-2.0.0-r1.ebuild | 56 ---------------------- 3 files changed, 95 deletions(-) delete mode 100644 dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch delete mode 100644 dev-python/nbdime/nbdime-2.0.0-r1.ebuild (limited to 'dev-python/nbdime') diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest index 6ebd3a2e6152..3c60eb1f5427 100644 --- a/dev-python/nbdime/Manifest +++ b/dev-python/nbdime/Manifest @@ -1,6 +1,3 @@ -AUX nbdime-2.0.0-remove-bdist_egg-hack.patch 1176 BLAKE2B 49c2d31632b8341f7fd52d70f063d8229d74a65a23058fe24410fac62939bd64adcf9af419d6f7b626d67150e54016323f33c735d7a51e80b35403dee1055979 SHA512 9d8200ebf6c6d76d3efc89ae384586404fa2d9b345c16f63ddc93d76c8ac2e17e34099bc0b2b907723f6fe096f6c56273b423263f328bc5882046488c077bbbe -DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142 DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244 SHA512 be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855 -EBUILD nbdime-2.0.0-r1.ebuild 1514 BLAKE2B 117f17e07d1884532145be78e4a483ef95c48a9b93108e91a230dc47b19c568d6942782dfa2a5bb611f275b372be49d8b08a9b03deed9860143f77d014f15602 SHA512 ad682cd164be21c7ba8db6c8abcf61b7a39294fbf5b0815016df2deef35cd107b72198e2eff7dd71817263a28d81033bfa45ea2b2c279de5b7696f41ee3ce9d3 EBUILD nbdime-3.1.0.ebuild 2508 BLAKE2B 226e7695cbd4609c7aa81a7590cdf07f033fb3c3670ab77bda26697c111f59e30ca2b003d6a3937f061be1284e493fd3a696a938c55301952dd9e8f6eccf0197 SHA512 aa3683566821f5dec4cc311db1677bc34bee6c256897fdf1562a77d42292378756a0736894131411549515ddad4415f88c0f95ab539eaaece41976bf23de18b4 MISC metadata.xml 514 BLAKE2B c3062055cb710079162f879e3a7ca9cc1009946eba2e3d09f5cdfeb9f3bccbc12a9c6fe86d84f80d88b07eb17d03b55f8d1c6770b97c7a760015e4466e6fa531 SHA512 069589261da9b38841c363712255d55e2203c55af94ce62c3640a90139b6d260d2f1ba6475b9c0264b8c4530207cdb17983ebb2f67565fef9fce891603c1d3a3 diff --git a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch deleted file mode 100644 index ff450f2ce447..000000000000 --- a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/setupbase.py -+++ b/setupbase.py -@@ -129,17 +129,6 @@ - build_py.finalize_options() - - --class bdist_egg_disabled(bdist_egg): -- """Disabled version of bdist_egg -- -- Prevents setup.py install performing setuptools' default easy_install, -- which it should never ever do. -- """ -- def run(self): -- sys.exit("Aborting implicit building of eggs. Use `pip install .` " -- " to install from source.") -- -- - def create_cmdclass(prerelease_cmd=None, package_data_spec=None, - data_files_spec=None): - """Create a command class with the given optional prerelease class. -@@ -179,14 +168,9 @@ - wrapper = functools.partial(_wrap_command, wrapped) - handle_files = _get_file_handler(package_data_spec, data_files_spec) - -- if 'bdist_egg' in sys.argv: -- egg = wrapper(bdist_egg, strict=True) -- else: -- egg = bdist_egg_disabled -- - cmdclass = dict( - build_py=wrapper(build_py, strict=is_repo), -- bdist_egg=egg, -+ bdist_egg=wrapper(bdist_egg, strict=True), - sdist=wrapper(sdist, strict=True), - handle_files=handle_files, - ) diff --git a/dev-python/nbdime/nbdime-2.0.0-r1.ebuild b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild deleted file mode 100644 index 13f592127ee1..000000000000 --- a/dev-python/nbdime/nbdime-2.0.0-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 - -DESCRIPTION="Diff and merge of Jupyter Notebooks" -HOMEPAGE="https://jupyter.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="webtools" - -RDEPEND=" - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/GitPython[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/nbformat[${PYTHON_USEDEP}] - dev-python/notebook[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - www-servers/tornado[${PYTHON_USEDEP}] - webtools? ( net-libs/nodejs[npm] )" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - dev-python/tabulate[${PYTHON_USEDEP}] - )" - -distutils_enable_sphinx docs/source \ - dev-python/recommonmark dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -PATCHES=( "${FILESDIR}"/${PN}-2.0.0-remove-bdist_egg-hack.patch ) - -python_configure_all() { - use webtools || mydistutilsargs=( --skip-npm ) -} - -python_test() { - # user.email and user.name are not configured in the sandbox - git config --global user.email "you@example.com" || die - git config --global user.name "Your Name" || die - - distutils_install_for_testing - pytest -vv || die "Tests fail with ${EPYTHON}" -} -- cgit v1.2.3