diff options
Diffstat (limited to 'dev-python/python-lsp-server')
| -rw-r--r-- | dev-python/python-lsp-server/files/python-lsp-server-1.5.0-unpin-all-the-deps.patch | 42 | ||||
| -rw-r--r-- | dev-python/python-lsp-server/python-lsp-server-1.5.0-r1.ebuild (renamed from dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild) | 33 |
2 files changed, 61 insertions, 14 deletions
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-unpin-all-the-deps.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-unpin-all-the-deps.patch new file mode 100644 index 000000000000..b8b3eb10f9f2 --- /dev/null +++ b/dev-python/python-lsp-server/files/python-lsp-server-1.5.0-unpin-all-the-deps.patch @@ -0,0 +1,42 @@ +diff --git a/pyproject.toml b/pyproject.toml +index ff60a18..0c756ff 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -26,26 +26,26 @@ Homepage = "https://github.com/python-lsp/python-lsp-server" + + [project.optional-dependencies] + all = [ +- "autopep8>=1.6.0,<1.7.0", +- "flake8>=4.0.0,<4.1.0", +- "mccabe>=0.6.0,<0.7.0", +- "pycodestyle>=2.8.0,<2.9.0", ++ "autopep8>=1.6.0", ++ "flake8>=4.0.0", ++ "mccabe>=0.6.0", ++ "pycodestyle>=2.8.0", + "pydocstyle>=2.0.0", +- "pyflakes>=2.4.0,<2.5.0", ++ "pyflakes>=2.4.0", + "pylint>=2.5.0", + "rope>=0.10.5", + "yapf", + "whatthepatch" + ] +-autopep8 = ["autopep8>=1.6.0,<1.7.0"] +-flake8 = ["flake8>=4.0.0,<4.1.0"] +-mccabe = ["mccabe>=0.6.0,<0.7.0"] +-pycodestyle = ["pycodestyle>=2.8.0,<2.9.0"] ++autopep8 = ["autopep8>=1.6.0"] ++flake8 = ["flake8>=4.0.0"] ++mccabe = ["mccabe>=0.6.0"] ++pycodestyle = ["pycodestyle>=2.8.0"] + pydocstyle = ["pydocstyle>=2.0.0"] +-pyflakes = ["pyflakes>=2.4.0,<2.5.0"] ++pyflakes = ["pyflakes>=2.4.0"] + pylint = ["pylint>=2.5.0"] + rope = ["rope>0.10.5"] +-yapf = ["yapf", "whatthepatch>=1.0.2,<2.0.0"] ++yapf = ["yapf", "whatthepatch>=1.0.2"] + websockets = ["websockets>=10.3"] + test = [ + "pylint>=2.5.0", diff --git a/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.5.0-r1.ebuild index e3b5826f34b4..1ef59a943186 100644 --- a/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild +++ b/dev-python/python-lsp-server/python-lsp-server-1.5.0-r1.ebuild @@ -14,62 +14,67 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="all-plugins" BDEPEND=" test? ( >=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}] - <dev-python/autopep8-1.7.0[${PYTHON_USEDEP}] dev-python/flaky[${PYTHON_USEDEP}] >=dev-python/flake8-4.0.0[${PYTHON_USEDEP}] - <dev-python/flake8-4.1.0[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}] - <dev-python/mccabe-0.7.0[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] + <dev-python/numpy-1.23.0[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] >=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}] - <dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}] >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}] >=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}] - <dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}] >=dev-python/pylint-2.5.0[${PYTHON_USEDEP}] dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}] >=dev-python/rope-0.10.5[${PYTHON_USEDEP}] dev-python/yapf[${PYTHON_USEDEP}] + >=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}] ) " RDEPEND=" >=dev-python/jedi-0.17.2[${PYTHON_USEDEP}] - <dev-python/jedi-0.19.0[${PYTHON_USEDEP}] >=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}] dev-python/pluggy[${PYTHON_USEDEP}] all-plugins? ( >=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}] - <dev-python/autopep8-1.7.0[${PYTHON_USEDEP}] >=dev-python/flake8-4.0.0[${PYTHON_USEDEP}] - <dev-python/flake8-4.1.0[${PYTHON_USEDEP}] >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}] - <dev-python/mccabe-0.7.0[${PYTHON_USEDEP}] >=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}] - <dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}] >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}] >=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}] - <dev-python/pyflakes-2.5.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/whatthepatch-1.0.2[${PYTHON_USEDEP}] ) " +# Upstream is overly cautious, insists on pinning +# dependencies to versions required by other dependencies. +# i.e. pin to <dev-python/pycodestyle-2.9.0 because +# dev-python/autopep8-1.6.0 requires that version. +# This causes way more problems then it solves. +PATCHES=( + "${FILESDIR}/${P}-unpin-all-the-deps.patch" +) + +EPYTEST_DESELECT=( + # This fails because the error output has changed slightly + "test/plugins/test_pylint_lint.py::test_syntax_error_pylint_py3" +) + distutils_enable_tests pytest python_prepare_all() { # remove pytest-cov dep - sed -i -e '0,/addopts/I!d' setup.cfg || die + sed -i -e '/addopts =/d' pyproject.toml || die distutils-r1_python_prepare_all } |