gentoo resync : 02.02.2022

5 files changed, 29 insertions, 141 deletions

diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 0814c46e07c1..871972914d1d 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,13 +1,9 @@
-DIST jupyter_server-1.11.1.tar.gz 420035 BLAKE2B 0676b0e126752ebeaa45e2325c34fe787756265f5ad35e356660485e5e7fd98a9ecaa029badf4c45815f25425e5a8a44133b6595698dca212f871b898c6ef76c SHA512 537bb9dbacabe396761a17be3280ecc0d28d63116a72386a7ff69bd8467f38909b7c2491eeb1f6b8bb7618b7fe661cd583d9efb8597ecbe88941c35096e0b1a8
-DIST jupyter_server-1.12.0.tar.gz 422318 BLAKE2B 9aa4843d02bfd918b0df13d94fc0058e6a6dee74f634dac359f7f6b4ca85e6cd4f91e8ddafb873647cd672284fb3eff087e05c3fcb6eff1621c7beb4b99030ee SHA512 28de049051852ae5d2bc10f2a0643a1441c2df3c229348e8d45e7031cc1c85a118124bc0b3bf7f101fd912ee25cd9cbf3e9b1b633fee20d70f43152e1e03e12c
-DIST jupyter_server-1.12.1.tar.gz 422410 BLAKE2B 611f17fe9804b0279c60ecc4fc1c23e6548643e4f7aa8e120580e167dc58a1f2d98ed7f07b90927bf07a71a89829d5701bd296a8f5ad3e954e4e8ee20c95bd5f SHA512 b199be8b0590c4bd14e995e6c9933f6da4d33e1796203cc157fd42b111db5ec6e860ef321d8311c30995d8aba6f1803dd0fec9148ae9a1cf427b7e38924f5357
 DIST jupyter_server-1.13.1.tar.gz 423717 BLAKE2B 9524e6648365e9c4158a8af4a4b277b4673ca320fc8e2c101ef2797ad89ebe8f93d25b1e74193ed88b06d151621a2ab9d9622cd06d67d5bea3a9ba96a95eb8e0 SHA512 e42a93930d16adb3952a0f98e3ae399a50881c32ef78205922511ea702dc24ffbeae30058fb1445897c4cf52873af0c03be16276398581a3eff52b58739ed2ba
 DIST jupyter_server-1.13.2.tar.gz 422777 BLAKE2B b263831ea27b5628c01f6c0897b213b8e97d60d234e6843817750eb41cf23cc27160841d3e65ccf210648571b8a0532c921bc9cd01ec56d78b4d1cad70cec91d SHA512 93a78a7b47c570e4bee80ef51fb0e35027caf414bfbd3c1bdf1f65d166d9756fade984070605f617912144b043c099c63812f7ba6b2be64c6524f5b8c6f24d7f
 DIST jupyter_server-1.13.3.tar.gz 423083 BLAKE2B 74bc31f0a853559a5368fc48ce9c9991147c76a13f4598cd0973ce27a4417a0320b157f83ce6f6c2450005f0d5668140175ee4d37d77160bb721ed27e9030372 SHA512 01c7a353b4890b4b9f33e4fec4d8ea141d60145d106cf21f9ba2372ee14e45433a0d83d78efa0ae7160f2fc22f7be0b4822992e9d135b3dfdc9bfb01a538f491
-EBUILD jupyter_server-1.11.1.ebuild 1878 BLAKE2B a9986b28f9888fb7a2f14c26985f1aab1765a3dbd6a77045a912256033ce7f407d3abd04241673a398459c4da41a5a6463680a76732009f50ab2ce7a41b55909 SHA512 62e47a7fddaa89fe5238fb24f7bd7145307fdbe7f7faecd76b78bf8368e936d99f51ffff2bc25a59d060e85257edb2a5e446d7310319a5a1f4fa5631423e4d10
-EBUILD jupyter_server-1.12.0.ebuild 1828 BLAKE2B d2da42c7b2241828d37c1a662f78607850a993e4ead018092ac01947bddb82488d1fcf3b39056452a4b1918fd35744cc4f27bd9779eb6c55d6eeee3b9a833522 SHA512 958c9993ec2b18424d573ee77aa8b104c9f3a9276f8609a8c31c1a93f9171c1d17e8a29a14ce25d8a3841c04b3283588176b0083bd6699bf32489fdd642303ff
-EBUILD jupyter_server-1.12.1.ebuild 1828 BLAKE2B d2da42c7b2241828d37c1a662f78607850a993e4ead018092ac01947bddb82488d1fcf3b39056452a4b1918fd35744cc4f27bd9779eb6c55d6eeee3b9a833522 SHA512 958c9993ec2b18424d573ee77aa8b104c9f3a9276f8609a8c31c1a93f9171c1d17e8a29a14ce25d8a3841c04b3283588176b0083bd6699bf32489fdd642303ff
+DIST jupyter_server-1.13.4.tar.gz 423176 BLAKE2B a1a3e2f57eb0c570649ead2b03328258575f04fe32c0ee4afc0758fffa8804cdbae24b2aa9e8785a81f287d6f5c197bf2f0a18803f9a65cef441b46950a3597d SHA512 c15ddf92a8f7cede8d2c45a9c1cee0f70373083f61f970794b88b8c7cd12b56e0ac0e451446392ed93db8944bfff0910046c163a088cd639a9bc9bdcdc4c597c
 EBUILD jupyter_server-1.13.1.ebuild 1875 BLAKE2B e21c3d86493d15f8b7a0a49a802dcc0ea8197e2d173fd6e9a40e49beadafb8942eed006d56356ee58a74d3eb21ee3ff29102e0cd3c66fce41c9709d24168273d SHA512 782b0c5993fca4ccfb072e5438bf9ff950f7a1ee5c5b2d6c26393798c2b9bfdd821c7063bf3a01f01efd979a2c06578968c6b196a79381d0665c5f81e35a256e
 EBUILD jupyter_server-1.13.2.ebuild 1915 BLAKE2B 97ed422b50b34e8c21dd900eac74f0e20ba256a04f0dee836b20e24181bd8683d20545f13a8126e4f57307bbda36583cfecf63fdd3a964a5563a2266800c6a52 SHA512 9b353205be2ff8b0ff2d28177e329c4b6765930c5a165d3913a0306a7dc0bdcb959e46137a499aeff77b952dbd83ed167361b4d8836cb1ee15720911ca4520b0
-EBUILD jupyter_server-1.13.3.ebuild 1911 BLAKE2B ed17bdc61a52877f4709eebeeacf370b393d0d789ec76087b043ab8d75161fcce3872fe9c4d01eabc63e0fee2d176fbc461f5fe168adac32464ed53213b5b32b SHA512 7d0b8c06907315ad37862cac070f69b5a2ecb0f8a850f82cac137a86f022ebcc34e7ccdbfe8bb87332dadf077df2c7d4e16086b88b0f1e2006872612e794cdf1
+EBUILD jupyter_server-1.13.3.ebuild 2028 BLAKE2B 8d47596398f2e69762ddf42375a09aa2918a589c29aa189651480950c45985650a7127d425babd8be5be91c0a3fa74241fd4b9defd38806e3ea3f3dff0b936ae SHA512 4b983c3d32418d6718da0dd0c9b5a7aabe9bf875c6189f3337fb60a12e492730b23baa67b8544b120b87e8f2fe003ad50b9f3ba229975190dc6a1a415de6469f
+EBUILD jupyter_server-1.13.4.ebuild 2103 BLAKE2B e16b5ea02526a51acb2d3dc1900116b7bcd0b2a4447fa55da9c363b788b520f9384b264d506f70661c627b330e0e2332be64a76b5dce3e58485528c55dacd373 SHA512 dcd8b9405b5db2214b4ff36599147986db2308985114f5f1f9e0daf71d318a54a339e7f48b21f7a68ed2eb4408cb8959a263a9b1cb470178ce2c1a2f9828de32
 MISC metadata.xml 437 BLAKE2B 8c156ef827979c733d2cc253fb4683f45630c8a94d5c3b0f402ec9f140a4c1295a6cc5d5a51887c73775c6162d616374c6da350ee38af52621a368f2757a2c02 SHA512 6b14cae4ef6d1c7b1b06a3735b87975e7ec4991437829ccfc32706b0d4e531c7c78d02d5d0e754cdb42149eaa09b73f2fdf5d651bd3f444d767654e6ecac4200
diff --git a/dev-python/jupyter_server/jupyter_server-1.12.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.12.0.ebuild
deleted file mode 100644
index 50269cac749e..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	dev-python/anyio[${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-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.12.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.12.1.ebuild
deleted file mode 100644
index 50269cac749e..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.12.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	dev-python/anyio[${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-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild
index 579da1dbc3ab..4747dd329823 100644
--- a/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild
@@ -42,9 +42,13 @@ BDEPEND="
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
 	)"
 
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
+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 --install pytest
 
 python_prepare_all() {
diff --git a/dev-python/jupyter_server/jupyter_server-1.11.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.4.ebuild
index 8d81f28043df..ffc18b1a7209 100644
--- a/dev-python/jupyter_server/jupyter_server-1.11.1.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.13.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,17 +20,18 @@ RDEPEND="
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
 	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	dev-python/anyio[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
 	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/requests-unixsocket[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
@@ -41,20 +42,25 @@ BDEPEND="
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
 	)"
 
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
+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 --install pytest
 
+EPYTEST_DESELECT=(
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	jupyter_server/tests/test_terminal.py::test_terminal_create_with_cwd
+	jupyter_server/tests/test_terminal.py::test_culling_config
+	jupyter_server/tests/test_terminal.py::test_culling
+)
+
 python_prepare_all() {
 	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
 	mv jupyter_server/conftest.py . || die
 
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
 	distutils-r1_python_prepare_all
 }