diff options
| -rw-r--r-- | dev-python/notebook/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/notebook/files/notebook-6.0.3-py39.patch | 73 | ||||
| -rw-r--r-- | dev-python/notebook/notebook-6.0.3.ebuild | 84 | ||||
| -rw-r--r-- | dev-python/notebook/notebook-6.1.3-r1.ebuild | 93 |
4 files changed, 0 insertions, 251 deletions
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest index f875d0b1486b..8e260306f041 100644 --- a/dev-python/notebook/Manifest +++ b/dev-python/notebook/Manifest @@ -1,3 +1,2 @@ -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 diff --git a/dev-python/notebook/files/notebook-6.0.3-py39.patch b/dev-python/notebook/files/notebook-6.0.3-py39.patch deleted file mode 100644 index 2b0fc134b58a..000000000000 --- a/dev-python/notebook/files/notebook-6.0.3-py39.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c01b2cc014af5c3f8c1e00907a985edc19cad8d7 Mon Sep 17 00:00:00 2001 -From: Karthikeyan Singaravelan <tir.karthi@gmail.com> -Date: Wed, 22 Jan 2020 00:41:58 +0530 -Subject: [PATCH] Remove deprecated encoding parameter for Python 3.9 - compatibility. - ---- - notebook/tests/test_gateway.py | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/notebook/tests/test_gateway.py b/notebook/tests/test_gateway.py -index d0cc84b09d..116b3db673 100644 ---- a/notebook/tests/test_gateway.py -+++ b/notebook/tests/test_gateway.py -@@ -176,7 +176,7 @@ def test_gateway_get_kernelspecs(self): - with mocked_gateway: - response = self.request('GET', '/api/kernelspecs') - self.assertEqual(response.status_code, 200) -- content = json.loads(response.content.decode('utf-8'), encoding='utf-8') -+ content = json.loads(response.content.decode('utf-8')) - kspecs = content.get('kernelspecs') - self.assertEqual(len(kspecs), 2) - self.assertEqual(kspecs.get('kspec_bar').get('name'), 'kspec_bar') -@@ -186,7 +186,7 @@ def test_gateway_get_named_kernelspec(self): - with mocked_gateway: - response = self.request('GET', '/api/kernelspecs/kspec_foo') - self.assertEqual(response.status_code, 200) -- kspec_foo = json.loads(response.content.decode('utf-8'), encoding='utf-8') -+ kspec_foo = json.loads(response.content.decode('utf-8')) - self.assertEqual(kspec_foo.get('name'), 'kspec_foo') - - response = self.request('GET', '/api/kernelspecs/no_such_spec') -@@ -257,7 +257,7 @@ def create_session(self, kernel_name): - # Create the kernel... (also tests get_kernel) - response = self.request('POST', '/api/sessions', **kwargs) - self.assertEqual(response.status_code, 201) -- model = json.loads(response.content.decode('utf-8'), encoding='utf-8') -+ model = json.loads(response.content.decode('utf-8')) - self.assertEqual(model.get('path'), nb_path) - kernel_id = model.get('kernel').get('id') - # ensure its in the running_kernels and name matches. -@@ -286,7 +286,7 @@ def is_kernel_running(self, kernel_id): - # Get list of running kernels - response = self.request('GET', '/api/kernels') - self.assertEqual(response.status_code, 200) -- kernels = json.loads(response.content.decode('utf-8'), encoding='utf-8') -+ kernels = json.loads(response.content.decode('utf-8')) - self.assertEqual(len(kernels), len(running_kernels)) - for model in kernels: - if model.get('id') == kernel_id: -@@ -305,7 +305,7 @@ def create_kernel(self, kernel_name): - - response = self.request('POST', '/api/kernels', **kwargs) - self.assertEqual(response.status_code, 201) -- model = json.loads(response.content.decode('utf-8'), encoding='utf-8') -+ model = json.loads(response.content.decode('utf-8')) - kernel_id = model.get('id') - # ensure its in the running_kernels and name matches. - running_kernel = running_kernels.get(kernel_id) -@@ -330,7 +330,7 @@ def restart_kernel(self, kernel_id): - with mocked_gateway: - response = self.request('POST', '/api/kernels/' + kernel_id + '/restart') - self.assertEqual(response.status_code, 200) -- model = json.loads(response.content.decode('utf-8'), encoding='utf-8') -+ model = json.loads(response.content.decode('utf-8')) - restarted_kernel_id = model.get('id') - # ensure its in the running_kernels and name matches. - running_kernel = running_kernels.get(restarted_kernel_id) -@@ -345,4 +345,3 @@ def delete_kernel(self, kernel_id): - response = self.request('DELETE', '/api/kernels/' + kernel_id) - self.assertEqual(response.status_code, 204) - self.assertEqual(response.reason, 'No Content') -- diff --git a/dev-python/notebook/notebook-6.0.3.ebuild b/dev-python/notebook/notebook-6.0.3.ebuild deleted file mode 100644 index cbdc69fba953..000000000000 --- a/dev-python/notebook/notebook-6.0.3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# 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_{6..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/jinja[${PYTHON_USEDEP}] - >=dev-python/terminado-0.8.1[${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}] - ) - " - -PATCHES=( - "${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch - "${FILESDIR}"/${P}-py39.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 - # TODO: high magic, SRE module mismatch - sed -e 's:test_connections:_&:' \ - -e 's:test_main_kernel_handler:_&:' \ - -i notebook/services/kernels/tests/test_kernels_api.py || die - - distutils-r1_python_prepare_all -} - -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-6.1.3-r1.ebuild b/dev-python/notebook/notebook-6.1.3-r1.ebuild deleted file mode 100644 index a484e7f04afd..000000000000 --- a/dev-python/notebook/notebook-6.1.3-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# 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 -} |