Adding metadata

8 files changed, 141 insertions, 70 deletions

diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 0184c6ee414a..bc0d83b6e71a 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,2 +1 @@
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
-DIST ipykernel-5.5.5.tar.gz 112909 BLAKE2B ff898dc10f767838353de13571de4c42ea59aae9b367046265808d9f1f7abfbd3934b7b4370fe024b647b5268316c573f7d52b2e62284a6c430005a901dfd6bf SHA512 580c3a3d5d10c325524287c091a885955981bedb8c7bd8eac569ee19393b258dbfbc7ea8700137071c2c55bfa94b5a7bfae1c687bc5e2d532525c6fc3e043835
diff --git a/dev-python/ipykernel/ipykernel-5.5.5.ebuild b/dev-python/ipykernel/ipykernel-5.5.5.ebuild
deleted file mode 100644
index 174792865543..000000000000
--- a/dev-python/ipykernel/ipykernel-5.5.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO
-		ipykernel/tests/test_serialize.py::test_numpy_in_seq
-		ipykernel/tests/test_serialize.py::test_numpy_in_dict
-		ipykernel/tests/test_serialize.py::test_class
-		ipykernel/tests/test_serialize.py::test_class_oldstyle
-		ipykernel/tests/test_serialize.py::test_class_inheritance
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index 5e6dd4d1afff..188a41d9b51a 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -46,25 +46,24 @@ python_prepare_all() {
 	# test_complete_expanduser relies on $HOME not being empty
 	> "${HOME}"/somefile || die
 
-	# TODO: investigate
-	sed -e 's:test_local_import:_&:' \
-		-i test/test_utils.py || die
-	sed -e '/with sqlite3\.connect/,+2d' \
-		-i test/completion/stdlib.py || die
-	rm test/completion/django.py || die
+	distutils-r1_python_prepare_all
+}
 
-	# these tests fail with various pytest<->python version combinations
-	rm test/completion/pytest.py || die
+python_test() {
+	local deselect=(
+		# TODO
+		'test/test_integration.py::test_completion[stdlib:155]'
+		'test/test_integration.py::test_completion[on_import:29]'
+		# assume pristine virtualenv
+		test/test_utils.py::TestSetupReadline::test_local_import
+		test/test_inference/test_imports.py::test_os_issues
+	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# new features increased the match count again
+		test/test_utils.py::TestSetupReadline::test_import
 
-	# tests relying on pristine virtualenv
-	# this relies on test* not matching anything else
-	sed -e "/#\? \['test'\]/,+1d" \
-		-i test/completion/on_import.py || die
-	# this one's broken by 'path' module (dev-python/path-py)
-	sed -e 's:test_os_issues:_&:' \
-		-i test/test_inference/test_imports.py || die
-	sed -e 's:test_venv_and_pths:_&:' \
-		-i test/test_inference/test_sys_path.py || die
+	)
 
-	distutils-r1_python_prepare_all
+	# django and pytest tests are very version dependent
+	epytest ${deselect[@]/#/--deselect } -k "not django and not pytest"
 }
diff --git a/dev-python/parso/files/parso-0.8.2-py310.patch b/dev-python/parso/files/parso-0.8.2-py310.patch
new file mode 100644
index 000000000000..2f3487dd2f61
--- /dev/null
+++ b/dev-python/parso/files/parso-0.8.2-py310.patch
@@ -0,0 +1,29 @@
+From cbb61fb81955a8cdbb5cdeedc9bcfffa39a5f270 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 22 Apr 2021 21:04:49 +0200
+Subject: [PATCH] Relax a test regex to match new enum repr in Python 3.10.0a7+
+ (#186)
+
+bpo-40066: Enum: adjust repr() to show only enum and member name (not value,
+nor angle brackets) and str() to show only member name.
+https://bugs.python.org/issue40066
+---
+ test/test_pgen2.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_pgen2.py b/test/test_pgen2.py
+index 9b0dd34..85ccacf 100644
+--- a/test/test_pgen2.py
++++ b/test/test_pgen2.py
+@@ -339,7 +339,7 @@ def test_left_recursion():
+ @pytest.mark.parametrize(
+     'grammar, error_match', [
+         ['foo: bar | baz\nbar: NAME\nbaz: NAME\n',
+-         r"foo is ambiguous.*given a PythonTokenTypes\.NAME.*bar or baz"],
++         r"foo is ambiguous.*given a (PythonTokenTypes\.)?NAME.*bar or baz"],
+         ['''foo: bar | baz\nbar: 'x'\nbaz: "x"\n''',
+          r"foo is ambiguous.*given a ReservedString\(x\).*bar or baz"],
+         ['''foo: bar | 'x'\nbar: 'x'\n''',
+-- 
+2.32.0
+
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
index 72cb6690bc5d..f979dab1ffdd 100644
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ b/dev-python/parso/parso-0.8.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 
@@ -17,3 +17,17 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# py3.10 changed exception messages
+		test/test_python_errors.py::test_python_exception_matches
+		test/test_python_errors.py::test_default_except_error_postition
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 4257e611c47a..74169a1a4a54 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1 +1,2 @@
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
+DIST pyzmq-22.1.0.gh.tar.gz 401919 BLAKE2B ec43c62e68633a7e0ac06e7a717b6409e444dbd1347154c2a29a2dfb00916829656308122fa2cf0fc1e3013c82ba6bcc5e11b86582f95d46f43e9e81f6d8ff74 SHA512 aa135279927bff07339b99b4ebbc7d47effbfba7df99d3576088fe0e7d4a3ad44174a928e8b94afdeaf531c6a30cbb7bb88bce7fe19e7e5420b079ffb8e8690e
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
index e0d58afa0ea0..b30dc451bbac 100644
--- a/dev-python/pyzmq/pyzmq-20.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -76,12 +76,13 @@ python_test() {
 		zmq/tests/test_security.py::TestSecurity::test_plain
 		zmq/tests/test_socket.py::TestSocket::test_large_send
 		zmq/tests/test_socket.py::TestSocket::test_tracker
-		zmq/tests/test_socket.py::TestSocketGreen::test_large_send
 
-		# hanging tests
-		zmq/tests/test_socket.py::TestSocketGreen::test_tracker
+		# green-thing tests cause hangs or crashes
+		zmq/tests/test_socket.py::TestSocketGreen
+
+		# hangs
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
 	)
 
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
new file mode 100644
index 000000000000..c278f79f7105
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local deselect=(
+		# TODO
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_cython.py::test_cython
+
+		# hangs often
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
+	)
+
+	cd "${BUILD_DIR}"/lib || die
+	epytest -p no:flaky ${deselect[@]/#/--deselect } \
+		--ignore zmq/tests/test_mypy.py
+	rm -rf .hypothesis .pytest_cache || die
+}