diff --git a/textproc/py-python-lsp-server/Makefile b/textproc/py-python-lsp-server/Makefile index aef3194698f8..f6e6aecf5de6 100644 --- a/textproc/py-python-lsp-server/Makefile +++ b/textproc/py-python-lsp-server/Makefile @@ -1,51 +1,51 @@ PORTNAME= python-lsp-server PORTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= rhurlin@FreeBSD.org COMMENT= Python implementation of the Language Server Protocol WWW= https://github.com/python-lsp/python-lsp-server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autopep8>0:textproc/py-autopep8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mccabe>0:devel/py-mccabe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydocstyle>0:devel/py-pydocstyle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${PY_FLAVOR} \ pylint${PYTHON_PKGNAMESUFFIX}>0:devel/pylint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyls-black>0:devel/py-pyls-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-lsp-jsonrpc>0:textproc/py-python-lsp-jsonrpc@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rope>0:devel/py-rope@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flaky>=3.4.0:devel/py-flaky@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ pylint${PYTHON_PKGNAMESUFFIX}>0:devel/pylint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}whatthepatch>0:textproc/py-whatthepatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR} \ ${PYNUMPY} # make test: 3 failed, 134 passed, 9 skipped, 18 warnings # mainly because of py-numpy>=1.23.0 ... USES= python:3.7+ pytest USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes .include diff --git a/textproc/py-python-lsp-server/files/patch-pyproject.toml b/textproc/py-python-lsp-server/files/patch-pyproject.toml index 3d23a1842294..009b108ebab6 100644 --- a/textproc/py-python-lsp-server/files/patch-pyproject.toml +++ b/textproc/py-python-lsp-server/files/patch-pyproject.toml @@ -1,20 +1,36 @@ --- pyproject.toml.orig 2022-06-28 16:50:47 UTC +++ pyproject.toml -@@ -31,7 +31,7 @@ all = [ - "mccabe>=0.6.0,<0.7.0", - "pycodestyle>=2.8.0,<2.9.0", +@@ -26,23 +26,23 @@ all = [ + + [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", -@@ -42,7 +42,7 @@ pydocstyle = ["pydocstyle>=2.0.0"] - mccabe = ["mccabe>=0.6.0,<0.7.0"] - pycodestyle = ["pycodestyle>=2.8.0,<2.9.0"] + "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"]