gentoo resync : 29.12.2022

5 files changed, 121 insertions, 22 deletions

diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index c5e65c55e80e..a7cdca7fe754 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,5 +1,7 @@
-DIST jupyter_server-1.15.6.tar.gz 440539 BLAKE2B 11a090495fa9cf8fd59bc7c1b1149bb16e1e2e0b78a54e0ba827e5012fcc5910d90498c572c1f96cd4c73b5232f0e91c23f4296bddc7e63b006df034ad8fde3d SHA512 b967165c5509e724cb75dfbad0647e7c69fb4fa981bffd3475d480264c52de3d58e2504b01d7096091579dc065646eda11554c2b1ba9d5b6bc840cbcfb484f53
 DIST jupyter_server-1.17.0.tar.gz 445648 BLAKE2B d7e19804b6b4cccb72c0a24febe8702829c2a32768e916a9da09ee9f55a08e360cf2a81c3c4bc535ff342c916155bc0b7933a9b5b49645db2b5f9a58ec02ab3a SHA512 d99d4036698d6f8d5e1258de214e3cbc6239b978314af4af7e722789c950edb1f261b98e666cffb46efdfe97a23c001784cfd29d7bf75c02dae53c2c07476b7f
-EBUILD jupyter_server-1.15.6.ebuild 1942 BLAKE2B 624ee3273f0e9cef2793180eaa5c4dc645636cd1ed909e96b6ced19e9f4de33555be36f5a1f9ccef5ec7d62f2e1b78b9f40a703f2a94febc828d8c7c434e5633 SHA512 8a87f675a0e28f2a050f18a26019fba5959fd45a9220345676c565e3dc096fdf8528647a2096db1475011d124cc5856aa0db6855309a99e147c683c21cb97466
-EBUILD jupyter_server-1.17.0.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
-MISC metadata.xml 437 BLAKE2B 8c156ef827979c733d2cc253fb4683f45630c8a94d5c3b0f402ec9f140a4c1295a6cc5d5a51887c73775c6162d616374c6da350ee38af52621a368f2757a2c02 SHA512 6b14cae4ef6d1c7b1b06a3735b87975e7ec4991437829ccfc32706b0d4e531c7c78d02d5d0e754cdb42149eaa09b73f2fdf5d651bd3f444d767654e6ecac4200
+DIST jupyter_server-1.17.1.tar.gz 449682 BLAKE2B ca7a8b57c50a552c20e3c2a6a1318357df87027770bb0f37ee5c6c8db1a99116429ace7f7a28fca9f62728ba8469ce9875dc6f3a4cdf0a447ea8df616dff936f SHA512 bf37188a796e590340589414361e04c8e0f5f81d0e03cf55ad12ef7b59f35708996664da27727824424dadc038b44259a66e55f99c2da4270e727eae615f4e26
+DIST jupyter_server-1.18.0.tar.gz 450132 BLAKE2B a378ba3bfdc629d05478c33365b2d6df893b9ce1dc3ce26c78efcbd69b42441ff730ca58a83fb87446d073f849ce5a6c725784a15953fe9bdae119e529fe30c8 SHA512 5a194a9811162774990b125020d75c134ca32ab916c046cf0345a3959868ab7b293c0659bd54c2da91ef5e8bbb9b433f9a6c16d829277d0f34e924c6332fa6c0
+EBUILD jupyter_server-1.17.0.ebuild 2278 BLAKE2B eaeeac1afbee14c94ea5449af306a73c1b66f2e6d2fef2da8715063ca56763699d6a2a5a0870bac069c9a297fdeb79ab425973c1d2a494b7d8c3ab695f3461e2 SHA512 2fab27241cb236e6ee15e26b94010eedf3c27388216f928d21a80656523ff99a5bbab3cce75f2943be15b2b696ef0ed4b74e7415b4fe2368ef59e8f6d391d6dc
+EBUILD jupyter_server-1.17.1.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
+EBUILD jupyter_server-1.18.0.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
+MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
index 7d41175712ea..e42e420e2751 100644
--- a/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild b/dev-python/jupyter_server/jupyter_server-1.17.1.ebuild
index 31abbffb1de9..7d41175712ea 100644
--- a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.17.1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=jupyter
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
@@ -12,36 +14,35 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
 	dev-python/websocket-client[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_sphinx docs/source \
 	dev-python/pydata-sphinx-theme \
@@ -50,10 +51,26 @@ distutils_enable_sphinx docs/source \
 	dev-python/sphinxemoji \
 	dev-python/sphinxcontrib-github-alt \
 	dev-python/sphinxcontrib-openapi
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(
 	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py::test_terminal_create_with_cwd
 	tests/test_terminal.py::test_culling
+	tests/test_terminal.py::test_terminal_create_with_cwd
+	tests/test_terminal.py::test_terminal_create_with_relative_cwd
 )
+
+src_prepare() {
+	# disable npm use
+	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+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/jupyter_server-1.18.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.18.0.ebuild
new file mode 100644
index 000000000000..7d41175712ea
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.18.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=jupyter
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1[${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-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst_parser \
+	dev-python/ipython \
+	dev-python/sphinxemoji \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-openapi
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	tests/test_terminal.py::test_culling
+	tests/test_terminal.py::test_terminal_create_with_cwd
+	tests/test_terminal.py::test_terminal_create_with_relative_cwd
+)
+
+src_prepare() {
+	# disable npm use
+	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+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
index a49ed0dc1ccd..7e3ab0d6de84 100644
--- a/dev-python/jupyter_server/metadata.xml
+++ b/dev-python/jupyter_server/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jupyter-server</remote-id>