Adding metadata

8 files changed, 147 insertions, 20 deletions

diff --git a/dev-python/incremental/incremental-21.3.0.ebuild b/dev-python/incremental/incremental-21.3.0.ebuild
index 0d263bf3c563..0610b22ad94e 100644
--- a/dev-python/incremental/incremental-21.3.0.ebuild
+++ b/dev-python/incremental/incremental-21.3.0.ebuild
@@ -19,7 +19,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 8da5c972c5ee..050ba92c227f 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,2 +1,3 @@
 DIST mypy-0.812.tar.gz 2122474 BLAKE2B 3bfbfe3010798d49bcf00aa1d926ffa8a54be50fb2e88f4ffc3cde3edba80a9b74853de17126394dc1806c07b740b5f8e7775f2fe4b2312e0a85134b446a690b SHA512 ee89f56a7a01214540f9b727f153a075a097b161b7f654d926d1080ae540ec68303629a4fe691fcb53d37c3eb08924bf01d22cdf1c3761b414a3bc40af3363e6
+DIST mypy-0.902.tar.gz 2549241 BLAKE2B ba8bce0434b08c379907f96f22c030048ff8c45f426eb4a6b6951059974bd3f35b5e6bc759b9b6ff0237d43811d01181e58ea2cf919fda3e2649c37825d86134 SHA512 b896d5a614982d60dbeffadf56a5faff3d809c4d2af299fc658a67c09c3f36cab961d8516d38ea682227d9a06613a3aff7bb041ba1346354b81ec1187316d258
 DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf91ba7bfa2ed3e2369d70ab76ce152e00f321e79f36ef7c264d477e350579eaade222e8347b4105fb93b847d944ce0aa182466ce636649098a2df69c09ee5d SHA512 8497ee9719e162f84556407296d383e0b7e695cf6cd60bbf7f34c1d7aada3926fd5516ce7ea3863e11b3bcb87f12617733082f020718610e467877872f0b4487
diff --git a/dev-python/mypy/mypy-0.902.ebuild b/dev-python/mypy/mypy-0.902.ebuild
new file mode 100644
index 000000000000..91108c297b78
--- /dev/null
+++ b/dev-python/mypy/mypy-0.902.ebuild
@@ -0,0 +1,52 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
+SRC_URI="
+	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
new file mode 100644
index 000000000000..ae614ad86ec7
--- /dev/null
+++ b/dev-python/python-lsp-black/Manifest
@@ -0,0 +1 @@
+DIST python-lsp-black-1.0.0.gh.tar.gz 5714 BLAKE2B 8189ab4742b303f32a7963b67b40d826196d5d0420970aeeb7ff614e686be0571143a18d91f2964dc3fd48b71d3d5fb77f76f0877df0c462eef5d2c996200a44 SHA512 46377a4d1bdd40e72a6174468838ed06b26a403029a6911c52dd325581b3423bf9b2c4decc6c931cb177ca9ad481135531e176b0afa602236acbb3dd18f490be
diff --git a/dev-python/python-lsp-black/metadata.xml b/dev-python/python-lsp-black/metadata.xml
new file mode 100644
index 000000000000..c591b20d1750
--- /dev/null
+++ b/dev-python/python-lsp-black/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">python-lsp-black</remote-id>
+  <remote-id type="github">python-lsp/python-lsp-black</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.0.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.0.0.ebuild
new file mode 100644
index 000000000000..31634be05948
--- /dev/null
+++ b/dev-python/python-lsp-black/python-lsp-black-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Black plugin for the Python LSP Server"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-black
+	https://pypi.org/project/python-lsp-black/"
+SRC_URI="https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/python-lsp-server[${PYTHON_USEDEP}]
+	>=dev-python/black-19[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/spyder/spyder-4.2.5.ebuild b/dev-python/spyder/spyder-4.2.5-r1.ebuild
index 0114bc05efe4..4d43e8024f58 100644
--- a/dev-python/spyder/spyder-4.2.5.ebuild
+++ b/dev-python/spyder/spyder-4.2.5-r1.ebuild
@@ -59,24 +59,22 @@ RDEPEND="
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
 
 	dev-python/autopep8[${PYTHON_USEDEP}]
 	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
 	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 	dev-python/yapf[${PYTHON_USEDEP}]
 
-	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
 	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
@@ -142,6 +140,25 @@ python_prepare_all() {
 	# runs against things packaged in external-deps dir
 	rm conftest.py || die
 
+	# Use the spyder fork of pyls (python-lsp-server instead of python-language-server)
+	# The original hasn't been update in over 6 months, and spyder upstream is slow
+	# in making the switch. Because we are running into issues with outdated deps
+	# and a whole dependency mess as a result, we can no longer wait for upstream.
+	find . -name "*.py" -exec sed -i \
+		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
+		-e 's/python-language-server/python-lsp-server/g' \
+		-e 's/python_language_server/python_lsp_server/g' \
+		-e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
+		-e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
+		-e 's/pyls/pylsp/g' \
+		-e 's/pylsp-spyder/pyls-spyder/g' \
+		-e 's/pylsp_spyder/pyls_spyder/g' \
+		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
+		-e 's/pylsp-black/python-lsp-black/g' \
+		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
+		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
+		{} + || die
+
 	# do not depend on pyqt5<13
 	sed -i -e '/pyqt5/d' \
 		-e '/pyqtwebengine/d' \
diff --git a/dev-python/spyder/spyder-5.0.4.ebuild b/dev-python/spyder/spyder-5.0.4-r1.ebuild
index d935b172a70d..8f25468b7fe9 100644
--- a/dev-python/spyder/spyder-5.0.4.ebuild
+++ b/dev-python/spyder/spyder-5.0.4-r1.ebuild
@@ -52,11 +52,9 @@ RDEPEND="
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
-	<dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
-	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
@@ -73,17 +71,16 @@ RDEPEND="
 	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
 "
 
-# python-language-server[all] deps
+# python-lsp-server[all] deps
 RDEPEND+="
 	dev-python/autopep8[${PYTHON_USEDEP}]
 	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
 	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 	dev-python/yapf[${PYTHON_USEDEP}]
@@ -144,6 +141,25 @@ python_prepare_all() {
 	# runs against things packaged in external-deps dir
 	rm conftest.py || die
 
+	# Use the spyder fork of pyls (python-lsp-server instead of python-language-server)
+	# The original hasn't been update in over 6 months, and spyder upstream is slow
+	# in making the switch. Because we are running into issues with outdated deps
+	# and a whole dependency mess as a result, we can no longer wait for upstream.
+	find . -name "*.py" -exec sed -i \
+		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
+		-e 's/python-language-server/python-lsp-server/g' \
+		-e 's/python_language_server/python_lsp_server/g' \
+		-e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
+		-e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
+		-e 's/pyls/pylsp/g' \
+		-e 's/pylsp-spyder/pyls-spyder/g' \
+		-e 's/pylsp_spyder/pyls_spyder/g' \
+		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
+		-e 's/pylsp-black/python-lsp-black/g' \
+		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
+		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
+		{} + || die
+
 	# do not depend on pyqt5<13
 	sed -i -e '/pyqt5/d' \
 		-e '/pyqtwebengine/d' \