From 54fd07e667e5b28d2f8b60e31fbf57b0059266e5 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 17 Mar 2023 06:06:19 +0100 Subject: Rename dev-python/{jupyter_server → jupyter-server} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/ipyparallel/ipyparallel-8.4.1.ebuild | 2 +- dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild | 2 +- .../jupyter-server-fileid-0.8.0.ebuild | 2 +- .../jupyter-server-proxy-3.2.2.ebuild | 2 +- .../jupyter-server-terminals-0.4.4.ebuild | 2 +- dev-python/jupyter-server/Manifest | 1 + .../files/jupyter-server-2.0.1-skip-npm.patch | 22 +++++++ .../jupyter-server/jupyter-server-2.4.0.ebuild | 75 ++++++++++++++++++++++ dev-python/jupyter-server/metadata.xml | 17 +++++ dev-python/jupyter_server/Manifest | 1 - .../files/jupyter_server-2.0.1-skip-npm.patch | 22 ------- .../jupyter_server/jupyter_server-2.4.0.ebuild | 75 ---------------------- dev-python/jupyter_server/metadata.xml | 17 ----- .../jupyter_server_mathjax-0.2.6.ebuild | 2 +- .../jupyterlab-server-2.20.0.ebuild | 6 +- dev-python/jupyterlab/jupyterlab-3.5.3.ebuild | 2 +- dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild | 2 +- dev-python/nbclassic/nbclassic-0.5.1.ebuild | 2 +- dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +- .../notebook_shim/notebook_shim-0.2.2-r1.ebuild | 4 +- .../pytest_jupyter/pytest_jupyter-0.6.2.ebuild | 2 +- 21 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 dev-python/jupyter-server/Manifest create mode 100644 dev-python/jupyter-server/files/jupyter-server-2.0.1-skip-npm.patch create mode 100644 dev-python/jupyter-server/jupyter-server-2.4.0.ebuild create mode 100644 dev-python/jupyter-server/metadata.xml delete mode 100644 dev-python/jupyter_server/Manifest delete mode 100644 dev-python/jupyter_server/files/jupyter_server-2.0.1-skip-npm.patch delete mode 100644 dev-python/jupyter_server/jupyter_server-2.4.0.ebuild delete mode 100644 dev-python/jupyter_server/metadata.xml (limited to 'dev-python') diff --git a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild index f34f5b06a4bd..3edb9fe27d67 100644 --- a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild +++ b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild @@ -27,7 +27,7 @@ RDEPEND=" >=dev-python/traitlets-4.3[${PYTHON_USEDEP}] >=dev-python/ipython-4[${PYTHON_USEDEP}] dev-python/jupyter_client[${PYTHON_USEDEP}] - dev-python/jupyter_server[${PYTHON_USEDEP}] + dev-python/jupyter-server[${PYTHON_USEDEP}] >=dev-python/ipykernel-4.4[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] diff --git a/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild index 735722091cfd..11dd9c072091 100644 --- a/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild +++ b/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild @@ -21,7 +21,7 @@ RESTRICT="test" RDEPEND=" dev-python/entrypoints[${PYTHON_USEDEP}] - >=dev-python/jupyter_server-1.1.2[${PYTHON_USEDEP}] + >=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}] " distutils_enable_tests pytest diff --git a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild index 158c58539de2..8655bfad84b2 100644 --- a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild +++ b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild @@ -20,7 +20,7 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - dev-python/jupyter_server[${PYTHON_USEDEP}] + dev-python/jupyter-server[${PYTHON_USEDEP}] ~dev-python/jupyter_events-0.5.0[${PYTHON_USEDEP}] " diff --git a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild index b7d96bbda0a0..4b1aef499b80 100644 --- a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild +++ b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" RDEPEND=" dev-python/aiohttp[${PYTHON_USEDEP}] - >=dev-python/jupyter_server-1.0[${PYTHON_USEDEP}] + >=dev-python/jupyter-server-1.0[${PYTHON_USEDEP}] >=dev-python/simpervisor-0.4[${PYTHON_USEDEP}] " BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]" diff --git a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild index 22012eed678d..0ffaf8a0fa56 100644 --- a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild +++ b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild @@ -25,7 +25,7 @@ RDEPEND=" BDEPEND=" test? ( - dev-python/jupyter_server[${PYTHON_USEDEP}] + dev-python/jupyter-server[${PYTHON_USEDEP}] dev-python/pytest_jupyter[${PYTHON_USEDEP}] dev-python/pytest-timeout[${PYTHON_USEDEP}] ) diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest new file mode 100644 index 000000000000..cc3d08ee89ad --- /dev/null +++ b/dev-python/jupyter-server/Manifest @@ -0,0 +1 @@ +DIST jupyter_server-2.4.0.tar.gz 693740 BLAKE2B c50a06f1ebe1479c126c2a10ac7f58f012f97f8d565f1705b5d8080ff854a387a6bbcba65785652988a1adc3575009ea0b68e48b7cda8bbd89b5208e1a6d0612 SHA512 c5ceb6caa37c6d8bb5b3026f450bdfc92c37cb5a350541fa35764eeb33007918b2aa55b41108703477efe68f7d5e4f4ba3fea51cd203f3f3c0b74ba3bed6e1c5 diff --git a/dev-python/jupyter-server/files/jupyter-server-2.0.1-skip-npm.patch b/dev-python/jupyter-server/files/jupyter-server-2.0.1-skip-npm.patch new file mode 100644 index 000000000000..f7b484e020b6 --- /dev/null +++ b/dev-python/jupyter-server/files/jupyter-server-2.0.1-skip-npm.patch @@ -0,0 +1,22 @@ +diff --git a/pyproject.toml b/pyproject.toml +index a23f5e1..203f47f 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -140,17 +140,6 @@ validate-bump = false + [tool.hatch.build] + artifacts = ["jupyter_server/static/style"] + +-[tool.hatch.build.hooks.jupyter-builder] +-dependencies = ["hatch-jupyter-builder>=0.8.1"] +-build-function = "hatch_jupyter_builder.npm_builder" +-ensured-targets = [ +- "jupyter_server/static/style/bootstrap.min.css", +- "jupyter_server/static/style/bootstrap-theme.min.css" +-] +-skip-if-exists = ["jupyter_server/static/style/bootstrap.min.css"] +-install-pre-commit-hook = true +-optional-editable-build = true +- + [tool.black] + line-length = 100 + target-version = ["py38"] diff --git a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild new file mode 100644 index 000000000000..933e62cbd6cb --- /dev/null +++ b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications" +HOMEPAGE=" + https://jupyter.org/ + https://github.com/jupyter-server/jupyter_server/ + https://pypi.org/project/jupyter-server/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND=" + >=dev-python/anyio-3.1.0[${PYTHON_USEDEP}] + dev-python/argon2-cffi[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/jupyter_client-7.4.4[${PYTHON_USEDEP}] + >=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}] + dev-python/jupyter-server-terminals[${PYTHON_USEDEP}] + >=dev-python/jupyter_events-0.4.0[${PYTHON_USEDEP}] + >=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}] + >=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/prometheus_client[${PYTHON_USEDEP}] + >=dev-python/pyzmq-24[${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + >=dev-python/terminado-0.8.3[${PYTHON_USEDEP}] + >=dev-python/tornado-6.2[${PYTHON_USEDEP}] + >=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}] + dev-python/websocket-client[${PYTHON_USEDEP}] + +" +BDEPEND=" + test? ( + dev-python/ipykernel[${PYTHON_USEDEP}] + dev-python/pytest-console-scripts[${PYTHON_USEDEP}] + dev-python/pytest_jupyter[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + dev-python/pytest-tornasync[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +EPYTEST_DESELECT=( + # This fails if your terminal is zsh (and maybe other non-bash as well?) + tests/test_terminal.py + # Fails because above is ignored + tests/auth/test_authorizer.py + # Fails with additional extensions installed + tests/extension/test_app.py::test_stop_extension +) + +PATCHES=( + "${FILESDIR}/${PN}-2.0.1-skip-npm.patch" +) + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest \ + -p pytest_tornasync.plugin \ + -p jupyter_server.pytest_plugin \ + -p pytest_console_scripts \ + -p pytest_timeout +} diff --git a/dev-python/jupyter-server/metadata.xml b/dev-python/jupyter-server/metadata.xml new file mode 100644 index 000000000000..7e3ab0d6de84 --- /dev/null +++ b/dev-python/jupyter-server/metadata.xml @@ -0,0 +1,17 @@ + + + + + sci@gentoo.org + Gentoo Science Project + + + python@gentoo.org + Python + + + + jupyter-server + jupyter-server/jupyter_server + + diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest deleted file mode 100644 index cc3d08ee89ad..000000000000 --- a/dev-python/jupyter_server/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jupyter_server-2.4.0.tar.gz 693740 BLAKE2B c50a06f1ebe1479c126c2a10ac7f58f012f97f8d565f1705b5d8080ff854a387a6bbcba65785652988a1adc3575009ea0b68e48b7cda8bbd89b5208e1a6d0612 SHA512 c5ceb6caa37c6d8bb5b3026f450bdfc92c37cb5a350541fa35764eeb33007918b2aa55b41108703477efe68f7d5e4f4ba3fea51cd203f3f3c0b74ba3bed6e1c5 diff --git a/dev-python/jupyter_server/files/jupyter_server-2.0.1-skip-npm.patch b/dev-python/jupyter_server/files/jupyter_server-2.0.1-skip-npm.patch deleted file mode 100644 index f7b484e020b6..000000000000 --- a/dev-python/jupyter_server/files/jupyter_server-2.0.1-skip-npm.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index a23f5e1..203f47f 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -140,17 +140,6 @@ validate-bump = false - [tool.hatch.build] - artifacts = ["jupyter_server/static/style"] - --[tool.hatch.build.hooks.jupyter-builder] --dependencies = ["hatch-jupyter-builder>=0.8.1"] --build-function = "hatch_jupyter_builder.npm_builder" --ensured-targets = [ -- "jupyter_server/static/style/bootstrap.min.css", -- "jupyter_server/static/style/bootstrap-theme.min.css" --] --skip-if-exists = ["jupyter_server/static/style/bootstrap.min.css"] --install-pre-commit-hook = true --optional-editable-build = true -- - [tool.black] - line-length = 100 - target-version = ["py38"] diff --git a/dev-python/jupyter_server/jupyter_server-2.4.0.ebuild b/dev-python/jupyter_server/jupyter_server-2.4.0.ebuild deleted file mode 100644 index 933e62cbd6cb..000000000000 --- a/dev-python/jupyter_server/jupyter_server-2.4.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications" -HOMEPAGE=" - https://jupyter.org/ - https://github.com/jupyter-server/jupyter_server/ - https://pypi.org/project/jupyter-server/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/anyio-3.1.0[${PYTHON_USEDEP}] - dev-python/argon2-cffi[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/jupyter_client-7.4.4[${PYTHON_USEDEP}] - >=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}] - dev-python/jupyter-server-terminals[${PYTHON_USEDEP}] - >=dev-python/jupyter_events-0.4.0[${PYTHON_USEDEP}] - >=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}] - >=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/prometheus_client[${PYTHON_USEDEP}] - >=dev-python/pyzmq-24[${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] - >=dev-python/terminado-0.8.3[${PYTHON_USEDEP}] - >=dev-python/tornado-6.2[${PYTHON_USEDEP}] - >=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}] - dev-python/websocket-client[${PYTHON_USEDEP}] - -" -BDEPEND=" - test? ( - dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/pytest-console-scripts[${PYTHON_USEDEP}] - dev-python/pytest_jupyter[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - dev-python/pytest-tornasync[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # This fails if your terminal is zsh (and maybe other non-bash as well?) - tests/test_terminal.py - # Fails because above is ignored - tests/auth/test_authorizer.py - # Fails with additional extensions installed - tests/extension/test_app.py::test_stop_extension -) - -PATCHES=( - "${FILESDIR}/${PN}-2.0.1-skip-npm.patch" -) - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest \ - -p pytest_tornasync.plugin \ - -p jupyter_server.pytest_plugin \ - -p pytest_console_scripts \ - -p pytest_timeout -} diff --git a/dev-python/jupyter_server/metadata.xml b/dev-python/jupyter_server/metadata.xml deleted file mode 100644 index 7e3ab0d6de84..000000000000 --- a/dev-python/jupyter_server/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - sci@gentoo.org - Gentoo Science Project - - - python@gentoo.org - Python - - - - jupyter-server - jupyter-server/jupyter_server - - diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild index 45d15870b159..8104b01ca469 100644 --- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild +++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild @@ -20,7 +20,7 @@ SLOT="0" KEYWORDS="~amd64 ~riscv" RDEPEND=" - >=dev-python/jupyter_server-1.1[${PYTHON_USEDEP}] + >=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}] " BDEPEND=" dev-python/jupyter_packaging[${PYTHON_USEDEP}] diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild index 6280fed7052a..c3e034e2e133 100644 --- a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild +++ b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild @@ -26,8 +26,8 @@ RDEPEND=" >=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}] >=dev-python/packaging-21.3[${PYTHON_USEDEP}] >=dev-python/requests-2.28[${PYTHON_USEDEP}] - >=dev-python/jupyter_server-1.21[${PYTHON_USEDEP}] - =dev-python/jupyter-server-1.21[${PYTHON_USEDEP}] + =dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}] ' 3.8 3.9) @@ -36,7 +36,7 @@ RDEPEND=" BDEPEND=" test? ( dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/jupyter_server[${PYTHON_USEDEP}] + dev-python/jupyter-server[${PYTHON_USEDEP}] =dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}] =dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}] - >=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}] + >=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}] ~dev-python/jupyter_ydoc-0.2.2[${PYTHON_USEDEP}] >=dev-python/jupyter-server-ydoc-0.6.0[${PYTHON_USEDEP}]