* [gentoo-commits] repo/gentoo:master commit in: dev-python/nbdime/, dev-python/nbdime/files/
@ 2020-08-22 18:37 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-08-22 18:37 UTC (permalink / raw
To: gentoo-commits
commit: 556c851c4ee43e86e1121f2053a6b3f015c4f418
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 18:37:19 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 18:37:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=556c851c
dev-python/nbdime: Version bump to 2.0.0
Bug: https://bugs.gentoo.org/719106
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-python/nbdime/Manifest | 1 +
.../files/nbdime-2.0.0-remove-bdist_egg-hack.patch | 36 ++++++++++++++
dev-python/nbdime/nbdime-2.0.0.ebuild | 56 ++++++++++++++++++++++
3 files changed, 93 insertions(+)
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 4eb4ff20332..ada1366ba87 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,2 @@
DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
+DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
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
new file mode 100644
index 00000000000..ff450f2ce44
--- /dev/null
+++ b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
@@ -0,0 +1,36 @@
+--- 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.ebuild b/dev-python/nbdime/nbdime-2.0.0.ebuild
new file mode 100644
index 00000000000..29db8fbcd28
--- /dev/null
+++ b/dev-python/nbdime/nbdime-2.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..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}"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/nbdime/, dev-python/nbdime/files/
@ 2021-10-17 9:07 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2021-10-17 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 0374a8ddfabf84681abac96e264a1a420a0269f8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 09:04:57 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 09:04:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0374a8dd
dev-python/nbdime: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/nbdime/Manifest | 1 -
.../files/nbdime-2.0.0-remove-bdist_egg-hack.patch | 36 --------------
dev-python/nbdime/nbdime-2.0.0-r1.ebuild | 56 ----------------------
3 files changed, 93 deletions(-)
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 8c8d213e295..8eb220b0879 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1 @@
-DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244 SHA512 be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855
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 ff450f2ce44..00000000000
--- 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 13f592127ee..00000000000
--- 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}"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-17 9:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-22 18:37 [gentoo-commits] repo/gentoo:master commit in: dev-python/nbdime/, dev-python/nbdime/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-10-17 9:07 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox