From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- dev-python/notebook/Manifest | 8 +- .../files/notebook-5.0.0-example-execution.patch | 27 ------- .../files/notebook-5.0.0-setupbase.py.patch | 43 ---------- dev-python/notebook/metadata.xml | 1 + dev-python/notebook/notebook-6.1.3-r1.ebuild | 2 +- dev-python/notebook/notebook-6.1.4.ebuild | 93 ++++++++++++++++++++++ 6 files changed, 99 insertions(+), 75 deletions(-) delete mode 100644 dev-python/notebook/files/notebook-5.0.0-example-execution.patch delete mode 100644 dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch create mode 100644 dev-python/notebook/notebook-6.1.4.ebuild (limited to 'dev-python/notebook') diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest index dac19f35ba6f..b5b4066f988c 100644 --- a/dev-python/notebook/Manifest +++ b/dev-python/notebook/Manifest @@ -1,10 +1,10 @@ -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.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db AUX notebook-6.0.3-py39.patch 4042 BLAKE2B c15f7e4779cc6ccc20f837bf7867eb4ced353b0848b783e786b02549975a56e122ba85dec7ad9dae3963a80c34e8c22c1d8c95b054077cd397607db0c9c15329 SHA512 8e0d0851156935fab5b47fcf13fe0a92f6675914b9c3fac1a36c28e282b4003501572dcddac4d729ba798609c7c49b8241ac72277491907adbeb52b2dd14041f DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922 DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351 +DIST notebook-6.1.4.tar.gz 13933373 BLAKE2B 9e58a9913a3c24bb1cb364863a18993d44496e995dc43dc9a4b428c54a0dddcc8b7c4b444073029d97705f0b3eee37d63bb50eec066b9b5fe4cd0ee48f8df558 SHA512 55637ec76b283429ac8bc1de260529983cf0e4cb0f25b268330fcc1d07c6e75329d2806eaa5f10d149bf80bd11df26592fa71548fa03bdb05a57265221466b57 EBUILD notebook-6.0.3.ebuild 2369 BLAKE2B 89ebccda62bf6c1597dd015ed76fc9cf407bc3749a013c5762a530844528288bb8193c9454f604be02791b3d349227661dac899fee2030a250bcc558867e39c2 SHA512 7c17a5b0124fb1dc6af18cb9736793ea3a9b3e5b9179e64c7cd60311b1762e5339d4ac5c023d433bc57c2abd6bec5cbf65b91e167300ce139583e0ad7a33beb4 -EBUILD notebook-6.1.3-r1.ebuild 2589 BLAKE2B ba41ae96b619b3d1348c24604dfcd215cc25f89bd8c88b2fd76c9760295f09d7ccc88910726df55d614e30a7828c02f199dbfd268277bd1decbda8b581db5a1d SHA512 293d8e2ab1e28729414f9b7acb9af2198cc74ae18317722eaaf54338123e0bb8ade5e4ea38c1e02467db77c757a80e35ae2ec1b94b896f02603f0346c069fba2 +EBUILD notebook-6.1.3-r1.ebuild 2587 BLAKE2B f1fa42de905aa9732ae0a80893e680eec6de96c96fe39f793538736cc37bc30c1638ac6e0008a99dd70215f53f979e5c977c714abb3f9c54723ede6add29d781 SHA512 214e9bb13da3d0f320f9e88e2d6f8463747e586dff2927e9153fadd9c72ab511c829bc7da0ed8e4077ce13e01b60bdb354297a880aff232a8f62e64b42ee8d56 EBUILD notebook-6.1.3.ebuild 2589 BLAKE2B 111e1f31138241640409c8e08aabe188bed91c14d73c4962f021cc55e2cb015eb0638d10426bf63df30dfe935d6a84a9e04f1d3d416694abead8af75d616f1d9 SHA512 a26da170b99ab62deac489455a4139d04086bb525eb62c70f529f5063d4fb30a3d860a28bc3ce01015c16f5eb874bf542a850062bda1039df517331ee9933628 -MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7 +EBUILD notebook-6.1.4.ebuild 2589 BLAKE2B ba41ae96b619b3d1348c24604dfcd215cc25f89bd8c88b2fd76c9760295f09d7ccc88910726df55d614e30a7828c02f199dbfd268277bd1decbda8b581db5a1d SHA512 293d8e2ab1e28729414f9b7acb9af2198cc74ae18317722eaaf54338123e0bb8ade5e4ea38c1e02467db77c757a80e35ae2ec1b94b896f02603f0346c069fba2 +MISC metadata.xml 466 BLAKE2B a907de2cb309e201f79881fbc1084337fc9d5bb88af8ba4b65db62123703c5193df08d7a1ed7255417fe619bb197290ed76fa70bc5e04133a616c13f69cc7d3f SHA512 cffa01ae84a4242117574bb9dfc26f7152307f263d12270a9ee8bc978b780c8a19ae26db0b9e7bc98ab1ba82a44f222849a6a33a8a0c50a2887a01f3f94dc6c2 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 deleted file mode 100644 index 4516cadf11f6..000000000000 --- a/dev-python/notebook/files/notebook-5.0.0-example-execution.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit db90e16d17acc778efdfff6dca69767b47b60cbd -Author: Benda Xu -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/files/notebook-5.0.0-setupbase.py.patch b/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch deleted file mode 100644 index 4dc55d937cae..000000000000 --- a/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch +++ /dev/null @@ -1,43 +0,0 @@ -Disable bundled mathjax. - -Patch by Marius Brehler ---- a/setupbase.py -+++ b/setupbase.py -@@ -165,37 +165,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'), -- ]: -- 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/metadata.xml b/dev-python/notebook/metadata.xml index ed4782de272a..68142250c5d8 100644 --- a/dev-python/notebook/metadata.xml +++ b/dev-python/notebook/metadata.xml @@ -9,6 +9,7 @@ python@gentoo.org Python + notebook diff --git a/dev-python/notebook/notebook-6.1.3-r1.ebuild b/dev-python/notebook/notebook-6.1.3-r1.ebuild index 2f974c926f26..a484e7f04afd 100644 --- a/dev-python/notebook/notebook-6.1.3-r1.ebuild +++ b/dev-python/notebook/notebook-6.1.3-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND=" >=dev-libs/mathjax-2.4 diff --git a/dev-python/notebook/notebook-6.1.4.ebuild b/dev-python/notebook/notebook-6.1.4.ebuild new file mode 100644 index 000000000000..2f974c926f26 --- /dev/null +++ b/dev-python/notebook/notebook-6.1.4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{7..9} ) +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" + +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}] + >=www-servers/tornado-5.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/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. +BDEPEND=" + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/nose_warnings_filters[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/requests-unixsocket[${PYTHON_USEDEP}] + ) + " + +PATCHES=( + "${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch +) + +distutils_enable_tests pytest + +python_prepare_all() { + # disable bundled mathjax + sed -i 's/^.*MathJax.*$//' bower.json || die + + # require geckodriver + rm -r notebook/tests/selenium || die + # trash doesn't seem to work for us + sed -e 's:test_delete:_&:' \ + -i notebook/services/contents/tests/test_manager.py || die + sed -e 's:test_checkpoints_follow_file:_&:' \ + -e 's:test_delete:_&:' \ + -i notebook/services/contents/tests/test_contents_api.py || die + # network-sandbox? + sed -e 's:test_connections:_&:' \ + -e 's:test_culling:_&:' \ + -i notebook/services/kernels/tests/test_kernels_api.py || die + + sed -i -e "/'bdist_egg':/d" setup.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + distutils_install_for_testing + local -x PATH=${TEST_DIR}/scripts:${PATH} + pytest -vv || die "Tests failed with ${EPYTHON}" +} + +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 +} -- cgit v1.2.3