gentoo resync : 29.12.2022

3 files changed, 18 insertions, 49 deletions

diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index 916e12a72cd1..683f7ff03b8b 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab_server-2.11.2.tar.gz 62113 BLAKE2B b5c7e9062e3419d643d22980804c608ce3e274f9f213f184fb44131dc21ed192b46de61b97c55785dc88e7ce9e3145e1d6319316cc743b4de849be81fa43261e SHA512 c3b6a3455841ba7b2b2613987eec41ffe1c6023685ae46755980cbef4fab8b98ab4d47bf02345852941c8f6e15107f79ebf981b68e3ce47d5ead14ccc81cbdfe
-DIST jupyterlab_server-2.13.0.tar.gz 63896 BLAKE2B 4dd1f643cc68c9676ebab347a6ea01a58176a35d45262174e66c2e5b49881b21aa24692996d0622b96d0453793d04164f6eba710c2d7a31420ce12e52ac2c7fd SHA512 b7243c77765c811bce8ba82a612c034da22aa8ac7bc889a5d246a7db283bca29bf555f4ca849b8615c28d3d4cab57fbf08b0a15e08e045e9032792805cee59f8
-EBUILD jupyterlab_server-2.11.2.ebuild 1102 BLAKE2B d7171ce996a25db6905bd90eea5dadf87bc32a8be702ea1196c212c6262ecb0df41cf6d260fed21a2e91434cfd94de7e0df70b5117c2ced08e74665218a8400c SHA512 39784ee2d000c2009f0772bfb30d8ae2ce2e51e982a80afd333a5e83f8578ed7d952a95ca69e4aa6779b25ad01ba5b183d63fcc3202874967131884f939e833d
-EBUILD jupyterlab_server-2.13.0.ebuild 1155 BLAKE2B be0de110beecf885c6a1befe1482caad910d8570df7ba507fa3d48e184a9f14dee9d0c287ab5495c632db01120cbc10bdc4e9acf04addda5ee111e28a1de8b5e SHA512 7d703c5ec45fc06c5f35e3c1ce9aba8bef9686121c2f7de7163f0881d67e29aabc5013c4cac75a86133bc0f5ffdeb147cf180f57729c470731c8767d4a92731c
+DIST jupyterlab_server-2.14.0.tar.gz 62704 BLAKE2B 93277a6880a9395622e6c0ec1da9522c5e30e7a8144c8629de89f45845964008f0a435ec84289efe56043c8ebb998ea65df1d09f3da72096f255fcafa29fab53 SHA512 21ecf749879663378d865bd06161fb3e331f3675038917e405df0cb77d4a4cec55340a35d6511676fa4d91ecaedcd1e7f8aec3a13ad3a39298d10911ab215cc6
+EBUILD jupyterlab_server-2.14.0.ebuild 1639 BLAKE2B 0d0e407d1cc7a23dc4695b1c02e26ee44245852312925557c26f982e158950cc874e8b71146b0099a1c174c176f609aa07a4c60701dc67a795b7c48b9f42f7c8 SHA512 3177bebf38b63510accbcad54965e0fb9ebb3cbaaa18c611d49c7b8fbca3ed44fd94d5412faf9d3eefd86a036b965a3e5976e26cc5ac83c5ba4b64e1cd84a422
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.11.2.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.11.2.ebuild
deleted file mode 100644
index 6d4c939cbb10..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.11.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
index 17950b25e18c..ec49d91d6512 100644
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
+++ b/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=hatchling
 inherit distutils-r1
 
 DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
@@ -15,9 +15,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# TODO: package openapi et al
-RESTRICT="test"
-
 RDEPEND="
 	dev-python/Babel[${PYTHON_USEDEP}]
 	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
@@ -30,11 +27,26 @@ RDEPEND="
 	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
 "
 
+BDEPEND="test? (
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/openapi-core[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+)"
+
 distutils_enable_tests pytest
 # TODO: package autodoc_traits
 #distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
 
 python_prepare_all() {
+	# This seems to not work for us, can only find english
+	rm tests/test_translation_api.py || die
+
 	# Do not depend on pytest-cov
 	sed -i -e '/addopts/d' pyproject.toml || die