public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/notebook/files/, dev-python/notebook/
@ 2017-08-19  8:54 Benda XU
  0 siblings, 0 replies; 3+ messages in thread
From: Benda XU @ 2017-08-19  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     337507fe19e4acba811d117feb539de94934d405
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 08:53:12 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 08:54:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337507fe

dev-python/notebook: fix sandbox violation when USE=doc.

Credit: Juergen Rose
Bug: 626860

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/notebook-5.0.0-example-execution.patch   | 27 ++++++++++++++++++++++
 dev-python/notebook/notebook-5.0.0.ebuild          |  5 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/dev-python/notebook/files/notebook-5.0.0-example-execution.patch b/dev-python/notebook/files/notebook-5.0.0-example-execution.patch
new file mode 100644
index 00000000000..4516cadf11f
--- /dev/null
+++ b/dev-python/notebook/files/notebook-5.0.0-example-execution.patch
@@ -0,0 +1,27 @@
+commit db90e16d17acc778efdfff6dca69767b47b60cbd
+Author: Benda Xu <heroxbd@gentoo.org>
+Date:   Sat Aug 19 17:31:38 2017 +0900
+
+    d/s/examples/N/Importing Notebooks.ipynb: disable execution.
+    
+      This notebook example includes writing to the directory of another
+      module, usually resulting in a doc build failure.  Therefore we
+      disable its execution by nbsphinx.
+    
+    Closes: #2372
+    See-Also: https://bugs.gentoo.org/show_bug.cgi?id=626860
+
+diff --git a/docs/source/examples/Notebook/Importing Notebooks.ipynb b/docs/source/examples/Notebook/Importing Notebooks.ipynb
+index ee42ad526..d6db5395e 100644
+--- a/docs/source/examples/Notebook/Importing Notebooks.ipynb	
++++ b/docs/source/examples/Notebook/Importing Notebooks.ipynb	
+@@ -511,6 +511,9 @@
+  ],
+  "metadata": {
+   "gist_id": "6011986",
++  "nbsphinx": {
++   "execute": "never"
++  },
+   "kernelspec": {
+    "display_name": "Python 3",
+    "language": "python",

diff --git a/dev-python/notebook/notebook-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
index fa4e605c702..b37ff0df779 100644
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ b/dev-python/notebook/notebook-5.0.0.ebuild
@@ -41,11 +41,12 @@ DEPEND="${RDEPEND}
 	doc? (
 		app-text/pandoc
 		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
 	)
 	"
 
-PATCHES=( "${FILESDIR}/${P}"-setupbase.py.patch )
+PATCHES=( "${FILESDIR}/${P}"-setupbase.py.patch
+	"${FILESDIR}/${P}"-example-execution.patch )
 
 python_prepare_all() {
 	sed \


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/notebook/files/, dev-python/notebook/
@ 2018-05-16 15:58 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-05-16 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     8f7160e545c10bf5596c91968d0e71caec162596
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 13:41:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 16 15:56:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7160e5

dev-python/notebook: Drop old

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-python/notebook/Manifest                       |  5 --
 .../files/notebook-4.2.0-setupbase.py.patch        | 42 ----------
 dev-python/notebook/notebook-4.0.6.ebuild          | 86 --------------------
 dev-python/notebook/notebook-4.1.0.ebuild          | 92 ---------------------
 dev-python/notebook/notebook-4.2.3.ebuild          | 93 ----------------------
 dev-python/notebook/notebook-4.3.2.ebuild          | 91 ---------------------
 dev-python/notebook/notebook-4.4.1.ebuild          | 91 ---------------------
 7 files changed, 500 deletions(-)

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index eeea5097090..7301c638257 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1 @@
-DIST notebook-4.0.6.tar.gz 6705277 BLAKE2B a2ea87ca39951bab1bfa5c6ca5952653dda5ce7a12abeaa0a80c4a334a649618f5832d950d8ceffedeaff260035b247e44fd1d10572140875131e7e55ffc39fd SHA512 9ce9ca21adcb967725aeb7a18543ace8aca4e88497d3d2fd708a603511e8ef4a932b39337d134d684df03b273bbc442958a37ced8cd499cb7b97a1c29758eeb0
-DIST notebook-4.1.0.tar.gz 9170981 BLAKE2B f0795388ac18f9702e12f2c9dcaae0eaa1372200a9e3d362f6afd5657491a86ccf37a6f3a775222c353a066194588a620c8fb3bbadc396d2328546cdd7063154 SHA512 745e412a737835956dc4238f70dbaf9c519fea55988941174febdc3ad24962031c3c66cb4ac355a9a639f9a383905e863e8eb0a3c6da62bf72026282154874cb
-DIST notebook-4.2.3.tar.gz 10092423 BLAKE2B a06f735220f13bee72b5e3309ef99ee7ac03450d80dd398c1ce5ace8957e73f19aa24266b00e4f1582c424597dced1eb563c06393fc854fec392d167b7167c62 SHA512 1b54e2a16fdb79b9344c0f73bd48fe438b18c529707b15816a3ab20353b2e320067082d51829c670117d77830a21c5a64a15d37d1970fd30aae31272d9650d97
-DIST notebook-4.3.2.tar.gz 10375345 BLAKE2B 346de30e5d78065fc514be874cb5538d3d19761e5d1f85b9c3a8ab99884cfbbccb150eac020ad6168557c417ffe00b52be7b1f4882ab35b0d30877502ea85c52 SHA512 8ff9a4852aafbc2761e82cd1cbacfc85dade97ec58386df55eea1e97f513b3d608106a2cc43305968fd990974daf6c8dac8aab4ab2184c56976289e646a62b7b
-DIST notebook-4.4.1.tar.gz 10377605 BLAKE2B 153fe02b30d661680782798e1d6041f3e08358b1200f1040c7f64efbc0a2e0717405b5d606fb5e41b8f03ab5a269aa8741bbc4ec2b6288024c780a0ae1541328 SHA512 416500355660e74e87edd1649821eb91154f2f0828dce0f2a6a8d3e6448f0ee4459ad661c9a030b5acb594659d37131c76d9edc30630f91700860dc6bfe4450b
 DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae

diff --git a/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch b/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
deleted file mode 100644
index a4c29048b92..00000000000
--- a/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Disable bundled mathjax.
-
-Patch by Marius Brehler
---- a/setupbase.py
-+++ b/setupbase.py
-@@ -152,36 +152,6 @@ def find_package_data():
-             if f.endswith(('.js', '.css')):
-                 static_data.append(pjoin(parent, f))
- 
--    # Trim mathjax
--    mj = lambda *path: pjoin(components, 'MathJax', *path)
--    static_data.extend([
--        mj('MathJax.js'),
--        mj('config', 'TeX-AMS_HTML-full.js'),
--        mj('config', 'Safe.js'),
--    ])
--    
--    trees = []
--    mj_out = mj('jax', 'output')
--    
--    if os.path.exists(mj_out):
--        for output in os.listdir(mj_out):
--            path = pjoin(mj_out, output)
--            static_data.append(pjoin(path, '*.js'))
--            autoload = pjoin(path, 'autoload')
--            if os.path.isdir(autoload):
--                trees.append(autoload)
--
--    for tree in trees + [
--        mj('localization'), # limit to en?
--        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
--        mj('extensions'),
--        mj('jax', 'input', 'TeX'),
--        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
--        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
--    ]:
--        for parent, dirs, files in os.walk(tree):
--            for f in files:
--                static_data.append(pjoin(parent, f))
- 
-     os.chdir(os.path.join('tests',))
-     js_tests = glob('*.js') + glob('*/*.js')

diff --git a/dev-python/notebook/notebook-4.0.6.ebuild b/dev-python/notebook/notebook-4.0.6.ebuild
deleted file mode 100644
index b20216c53d5..00000000000
--- a/dev-python/notebook/notebook-4.0.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-	sed -i 's/mj(/#mj(/' setupbase.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests --with-coverage --cover-package=notebook notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf "${EPREFIX}/usr/share/mathjax" "${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax
-}

diff --git a/dev-python/notebook/notebook-4.1.0.ebuild b/dev-python/notebook/notebook-4.1.0.ebuild
deleted file mode 100644
index eb0868e303e..00000000000
--- a/dev-python/notebook/notebook-4.1.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-	sed -i 's/mj(/#mj(/' setupbase.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed \
-			-e "/^    'sphinx.ext.intersphinx',/d" \
-			-i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax
-}

diff --git a/dev-python/notebook/notebook-4.2.3.ebuild b/dev-python/notebook/notebook-4.2.3.ebuild
deleted file mode 100644
index 973ad6e7b43..00000000000
--- a/dev-python/notebook/notebook-4.2.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed \
-			-e "/^    'sphinx.ext.intersphinx',/d" \
-			-i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}

diff --git a/dev-python/notebook/notebook-4.3.2.ebuild b/dev-python/notebook/notebook-4.3.2.ebuild
deleted file mode 100644
index ab0e469467d..00000000000
--- a/dev-python/notebook/notebook-4.3.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed \
-			-e "/^    'sphinx.ext.intersphinx',/d" \
-			-i docs/source/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 \
-		--verbosity=3 \
-		notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}

diff --git a/dev-python/notebook/notebook-4.4.1.ebuild b/dev-python/notebook/notebook-4.4.1.ebuild
deleted file mode 100644
index ca67bd63999..00000000000
--- a/dev-python/notebook/notebook-4.4.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://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-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed \
-			-e "/^    'sphinx.ext.intersphinx',/d" \
-			-i docs/source/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 \
-		--verbosity=3 \
-		notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/notebook/files/, dev-python/notebook/
@ 2023-07-24 12:49 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-07-24 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     9fbfdf24d785e488fc97aa23b089face850e1fd0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 12:45:59 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 12:45:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbfdf24

dev-python/notebook: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/notebook/Manifest                       |  1 -
 .../files/notebook-6.4.11-no-mathjax.patch         | 42 ----------
 dev-python/notebook/notebook-6.4.12.ebuild         | 97 ----------------------
 3 files changed, 140 deletions(-)

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index a7dfb7d1f6aa..dbd70028fc9f 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,3 +1,2 @@
-DIST notebook-6.4.12.tar.gz 14389641 BLAKE2B 1cda6a1eb1f4e7ccce964153bdce8de243588ffd4abcc5ab6687ba0ea347d68c5dd239c2af5bf93809409d850747db28df72be5c2ec03bfd06b725976ae1c599 SHA512 1314cfebe97ddada61e1013fdfd606bed08908c06b58e59f2fda6e63c43a1158eeed6a93a5cddbb609ecad0347bf80ee3a74747104fd29942629734c1ea749f0
 DIST notebook-6.5.4.tar.gz 5785832 BLAKE2B 28845c51c244d08b12e6a2853d3407a2af9e351f1501db8e76ff4f069e656d9bf27c3d2893b38f3f2bb51cedf38658219be3843a3397a588046d55bf445d3222 SHA512 72bf4efa4d553a6265c72e188ad0ee085accbbc05b0af182531c892303149d83f38f6d410f1bcb2c835071f713cb4267d58324b982b4087caabf9b46b8d77cfa
 DIST notebook-7.0.0.tar.gz 3922786 BLAKE2B 5aaeae9f48c456691607d5ef05012368f0e6abd1eb1266a5fc68ac999027cdb1e03a640b13048b47a754ef8c803bf1fe3a8c056dc600d825fa05387e905183a2 SHA512 fb58c03b60f02cc8b2096c13c493c38324fbb76a93dbb31a94775ed341a9594168598bc3a35ce18ef1ce6e2dd79f7b2e32d752dc3307780cfbc9fbc0c7f1c9a6

diff --git a/dev-python/notebook/files/notebook-6.4.11-no-mathjax.patch b/dev-python/notebook/files/notebook-6.4.11-no-mathjax.patch
deleted file mode 100644
index 85d326b9dfde..000000000000
--- a/dev-python/notebook/files/notebook-6.4.11-no-mathjax.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -dupr notebook-6.4.11.orig/setupbase.py notebook-6.4.11/setupbase.py
---- notebook-6.4.11.orig/setupbase.py	2022-04-20 09:37:45.964925905 +0200
-+++ notebook-6.4.11/setupbase.py	2022-04-20 09:40:32.624674341 +0200
-@@ -167,38 +167,6 @@ def find_package_data():
-             if f.endswith(('.js', '.css')):
-                 static_data.append(pjoin(parent, f))
- 
--    # Trim mathjax
--    mj = lambda *path: pjoin(components, 'MathJax', *path)
--    static_data.extend([
--        mj('MathJax.js'),
--        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
--        mj('config', 'Safe.js'),
--    ])
--
--    trees = []
--    mj_out = mj('jax', 'output')
--
--    if os.path.exists(mj_out):
--        for output in os.listdir(mj_out):
--            path = pjoin(mj_out, output)
--            static_data.append(pjoin(path, '*.js'))
--            autoload = pjoin(path, 'autoload')
--            if os.path.isdir(autoload):
--                trees.append(autoload)
--
--    for tree in trees + [
--        mj('localization'), # limit to en?
--        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
--        mj('extensions'),
--        mj('jax', 'input', 'TeX'),
--        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
--        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
--        mj('jax', 'element', 'mml'),
--    ]:
--        for parent, dirs, files in os.walk(tree):
--            for f in files:
--                static_data.append(pjoin(parent, f))
--
-     os.chdir(os.path.join('tests',))
-     js_tests = glob('*.js') + glob('*/*.js')
- 

diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
deleted file mode 100644
index 0367b35c25b6..000000000000
--- a/dev-python/notebook/notebook-6.4.12.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~ia64"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	>=dev-python/jupyter-packaging-0.9[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-"
-
-PDEPEND=">=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/notebook-6.4.11-no-mathjax.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	distutils-r1_python_prepare_all
-}
-
-EPYTEST_DESELECT=(
-	# trash doesn't seem to work for us
-	notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
-	notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
-	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
-	notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
-	notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
-	# TODO
-	notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
-	notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
-	notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
-	notebook/services/nbconvert/tests/test_nbconvert_api.py::APITest::test_list_formats
-)
-
-EPYTEST_IGNORE=(
-	# selenium tests require geckodriver
-	notebook/tests/selenium
-)
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-07-24 12:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-19  8:54 [gentoo-commits] repo/gentoo:master commit in: dev-python/notebook/files/, dev-python/notebook/ Benda XU
  -- strict thread matches above, loose matches on Subject: below --
2018-05-16 15:58 Andreas Sturmlechner
2023-07-24 12:49 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