From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-python/notebook/Manifest | 11 +- .../files/notebook-5.2.1-setupbase.py.patch | 44 -------- dev-python/notebook/notebook-5.0.0.ebuild | 93 ----------------- dev-python/notebook/notebook-5.2.1.ebuild | 103 ------------------- dev-python/notebook/notebook-5.7.8.ebuild | 113 --------------------- dev-python/notebook/notebook-6.0.3.ebuild | 2 +- dev-python/notebook/notebook-6.1.3.ebuild | 93 +++++++++++++++++ 7 files changed, 97 insertions(+), 362 deletions(-) delete mode 100644 dev-python/notebook/files/notebook-5.2.1-setupbase.py.patch delete mode 100644 dev-python/notebook/notebook-5.0.0.ebuild delete mode 100644 dev-python/notebook/notebook-5.2.1.ebuild delete mode 100644 dev-python/notebook/notebook-5.7.8.ebuild create mode 100644 dev-python/notebook/notebook-6.1.3.ebuild (limited to 'dev-python/notebook') diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest index e649199ecddd..dd85724d460e 100644 --- a/dev-python/notebook/Manifest +++ b/dev-python/notebook/Manifest @@ -1,14 +1,9 @@ AUX notebook-5.0.0-example-execution.patch 941 BLAKE2B 6df33095a99042a5345dc3b759121a43d269d1092288c1384d61844430d90e967868ad71fd7eddb6bba4b2493e489ac6b57b01f21d8a48297cd36438cd98861b SHA512 f9482d26fc098b9a3d525f5e299cf094cce192c6231d6bf6242e3e8081b7ab69f8f7955a746772aca7aef3d4c973b444f5f04004d1fe54e623bbd84d761f0512 AUX notebook-5.0.0-setupbase.py.patch 1368 BLAKE2B 7c80334d515becf41d881a1d4b3820a263c8cac2913dd9ef4df149bcd85ee7a09df6ba91e607f15ac35dde1a504e89775dec93043bfcdc7700643b645c986929 SHA512 14274ae6e2bc664e6c92390d480da0f5615b7f51863c10f3d11a7ec1a788ff357ae8113bac0c3d15932e322137b9e251c31bdf34c36a2dbbc0771407fe614a96 -AUX notebook-5.2.1-setupbase.py.patch 1407 BLAKE2B 0c7a0872f62df6c3e77aacdcb3736c09441479de127eb228fc8d65828a16656f37c4742c6101de841326a24c62bd4a4c76cf8d31f9dbfe61bc4249ecdaf55582 SHA512 6a01feb531b4594bbc0520c80dce53da66fbad3cfb3fce22c2b20e5d6652b8691581fe6a321ac5771b47ee1530bd27b0fac3fda55ab15573037379b84362bf67 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db AUX notebook-6.0.3-py39.patch 4042 BLAKE2B c15f7e4779cc6ccc20f837bf7867eb4ced353b0848b783e786b02549975a56e122ba85dec7ad9dae3963a80c34e8c22c1d8c95b054077cd397607db0c9c15329 SHA512 8e0d0851156935fab5b47fcf13fe0a92f6675914b9c3fac1a36c28e282b4003501572dcddac4d729ba798609c7c49b8241ac72277491907adbeb52b2dd14041f -DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae -DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576 -DIST notebook-5.7.8.tar.gz 13371684 BLAKE2B 077a94ec7085ae7325a972efb58f8d7eee5a541186522402084dfa55e335163fee30e68476265e9825c3623408989b1a0782ff6a5af71af4d8ea5e6e308c3a45 SHA512 1cccb23ce6810df85b3b600c0e2e5d6599be5551ea5243c7b1a9c73ed45c34dea8b16b0fbb3624aefb9eda848bce2fdcea1f3add8df3f00a90c13a9b01ea3f07 DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922 -EBUILD notebook-5.0.0.ebuild 2212 BLAKE2B 084e83dc0e77c008455afba813e376996fec0b22225c7a0b1e444f90e47922c0401fdfd16829e662d15e066f023239ba768a5c5f74284cbf5d21f7b06ca225a6 SHA512 3c8fcd5f09eea10d10e8726e7c60fb2dc69b6d1da393ea972318202f991e47fd92a4bf2f5e0e0312225670b494e219b269919cb9ec9aa173caa6df4632097cef -EBUILD notebook-5.2.1.ebuild 2481 BLAKE2B 82733e9825422222c2ea37146741ec5d510d7bddba8f331a074eb5ff8893be9e2b25cae279e519a43205997b1f2ea4a549baaac42b36d74060602241795c9fe4 SHA512 7ae45ff9d12cac19894432e8dbd0ec1fbdfc818bb76bbdf67cf91c8b19d1c79acf0bfebfce550b634529974201ce214db52018851838b47e8ba650cb48c157bc -EBUILD notebook-5.7.8.ebuild 2965 BLAKE2B b2cec1042caa14371ffb788d8380410131b11d4d6d62a2f248011227edeb741444db7c2fee142c2800f858e15e75cd035e4072fda9f67ca3e03d337bdc1d164f SHA512 514a170ce702ae495a6f0aff2b0c1d8aa467d00f7af69d27a54c891139d9ee258ab106ba99c4b3a6ae4afcd7dde677ef7e8f6289cfd576dc0c0ec94284cca1eb -EBUILD notebook-6.0.3.ebuild 2371 BLAKE2B 72a81edb848bc1623ba651aae700e751c439abb3c079ef33e843972817e86af2e897adcbf0dc221726b86a1166c31d79fc8dd6925eb14b268e62fac5b879aa62 SHA512 856dfb48af215bbd61ed8aa757de218639d327e87a3147649a3d374f6fd4363c6ff07d54f7480111aa154a556ea08cbc0fc97dc0d044cd1ad5c58b0da3b53c7c +DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351 +EBUILD notebook-6.0.3.ebuild 2369 BLAKE2B 89ebccda62bf6c1597dd015ed76fc9cf407bc3749a013c5762a530844528288bb8193c9454f604be02791b3d349227661dac899fee2030a250bcc558867e39c2 SHA512 7c17a5b0124fb1dc6af18cb9736793ea3a9b3e5b9179e64c7cd60311b1762e5339d4ac5c023d433bc57c2abd6bec5cbf65b91e167300ce139583e0ad7a33beb4 +EBUILD notebook-6.1.3.ebuild 2589 BLAKE2B 111e1f31138241640409c8e08aabe188bed91c14d73c4962f021cc55e2cb015eb0638d10426bf63df30dfe935d6a84a9e04f1d3d416694abead8af75d616f1d9 SHA512 a26da170b99ab62deac489455a4139d04086bb525eb62c70f529f5063d4fb30a3d860a28bc3ce01015c16f5eb874bf542a850062bda1039df517331ee9933628 MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7 diff --git a/dev-python/notebook/files/notebook-5.2.1-setupbase.py.patch b/dev-python/notebook/files/notebook-5.2.1-setupbase.py.patch deleted file mode 100644 index 97be84cb364a..000000000000 --- a/dev-python/notebook/files/notebook-5.2.1-setupbase.py.patch +++ /dev/null @@ -1,44 +0,0 @@ -Disable bundled mathjax. - -Patch by Marius Brehler. ---- a/setupbase.py -+++ b/setupbase.py -@@ -168,38 +168,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-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild deleted file mode 100644 index d4c0e2123f49..000000000000 --- a/dev-python/notebook/notebook-5.0.0.ebuild +++ /dev/null @@ -1,93 +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 Interactive Notebook" -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" -RESTRICT="!test? ( 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? ( - >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] - dev-python/nose_warnings_filters[${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/nbsphinx[${PYTHON_USEDEP}] - ) - " - -PATCHES=( "${FILESDIR}/${P}"-setupbase.py.patch - "${FILESDIR}/${P}"-example-execution.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-5.2.1.ebuild b/dev-python/notebook/notebook-5.2.1.ebuild deleted file mode 100644 index 3faa47b3b2ee..000000000000 --- a/dev-python/notebook/notebook-5.2.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Jupyter Interactive Notebook" -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" -RESTRICT="!test? ( 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-4.4.0[${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? ( - >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] - dev-python/nose_warnings_filters[${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.3.6[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - =dev-python/nbsphinx-0.2.14[${PYTHON_USEDEP}] - test? ( - dev-python/nbval[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ) - ) - " - -PATCHES=( "${FILESDIR}/${P}"-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 - addwrite /dev/dri/card0 - emake -C docs html - HTML_DOCS=( docs/build/html/. ) - fi -} - -python_test() { - nosetests \ - --verbosity=3 \ - notebook || die - - if use doc && python_is_python3; then - py.test --nbval --current-env docs || die - fi -} - -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-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild deleted file mode 100644 index 4c9dc036bc2d..000000000000 --- a/dev-python/notebook/notebook-5.7.8.ebuild +++ /dev/null @@ -1,113 +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 Interactive Notebook" -HOMEPAGE="https://jupyter.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64" -IUSE="doc test" -RESTRICT="!test? ( test )" -RDEPEND=" - >=dev-libs/mathjax-2.4 - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/terminado-0.8.1[${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-4.4.0[${PYTHON_USEDEP}] - >=dev-python/pyzmq-17[${PYTHON_USEDEP}] - >=dev-python/jupyter_client-5.2[${PYTHON_USEDEP}] - dev-python/nbformat[${PYTHON_USEDEP}] - >=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}] - dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] - dev-python/prometheus_client[${PYTHON_USEDEP}]" - -# sphinx 2+ seems to have a problem with its github plugin. temporarily adding -# a version constraint. -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/nose-exclude[${PYTHON_USEDEP}] - dev-python/nose_warnings_filters[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ) - doc? ( - app-text/pandoc - dev-python/ipython[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.6[${PYTHON_USEDEP}] -