From 45fbebbd4ed1b274d84ed180b7a9d94e86ed7dbd Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 5 May 2023 09:52:24 +0000 Subject: [PATCH] py-cmake-language-server: update to 0.1.7. What's Changed Run CI on mater branch by @regen100 in #57 Use PDM by @regen100 in #66 Update CI and CD by @regen100 in #67 Update pygls by @regen100 in #68 Support Python 3.11 by @regen100 in #69 --- lang/py-cmake-language-server/Makefile | 26 +++++++++++-------- lang/py-cmake-language-server/PLIST | 21 ++++++++------- lang/py-cmake-language-server/distinfo | 9 ++++--- .../patches/patch-pyproject.toml | 18 +++++++++++++ 4 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 lang/py-cmake-language-server/patches/patch-pyproject.toml diff --git a/lang/py-cmake-language-server/Makefile b/lang/py-cmake-language-server/Makefile index 56167ddfa579..2db26da4fa94 100644 --- a/lang/py-cmake-language-server/Makefile +++ b/lang/py-cmake-language-server/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2023/03/29 09:34:10 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2023/05/05 09:52:24 wiz Exp $ -DISTNAME= cmake-language-server-0.1.6 +DISTNAME= cmake-language-server-0.1.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= lang python MASTER_SITES= ${MASTER_SITE_PYPI:=c/cmake-language-server/} @@ -10,21 +10,25 @@ HOMEPAGE= https://github.com/regen100/cmake-language-server COMMENT= CMake Language Server Protocol Implementation LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-pygls>=0.12:../../lang/py-pygls +TOOL_DEPENDS+= ${PYPKGPREFIX}-pdm_backend>=0:../../devel/py-pdm_backend +DEPENDS+= ${PYPKGPREFIX}-pygls>=1.0:../../lang/py-pygls +TEST_DEPENDS+= cmake-[0-9]*:../../devel/cmake +TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.2.0:../../devel/py-test +TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov>=4.0.0:../../devel/py-test-cov +TEST_DEPENDS+= ${PYPKGPREFIX}-test-datadir>=1.4.1:../../devel/py-test-datadir +#TEST_DEPENDS+= ${PYPKGPREFIX}-cmakelang>=0.6.13:../../devel/py-cmakelang PYTHON_VERSIONS_INCOMPATIBLE= 27 -.include "../../lang/python/pyversion.mk" - -.if ${PYTHON_VERSION} < 308 -DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=4.8:../../devel/py-importlib-metadata -.endif - -USE_PKG_RESOURCES= yes +# only for tests +USE_LANGUAGES= c c++ post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} cmake-language-server cmake-language-server-${PYVERSSUFFIX} || ${TRUE} -.include "../../lang/python/egg.mk" +do-test: + cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} + +.include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/py-cmake-language-server/PLIST b/lang/py-cmake-language-server/PLIST index 7bbdab3ece60..293c644bb6f1 100644 --- a/lang/py-cmake-language-server/PLIST +++ b/lang/py-cmake-language-server/PLIST @@ -1,17 +1,18 @@ -@comment $NetBSD: PLIST,v 1.2 2022/08/10 11:42:58 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2023/05/05 09:52:24 wiz Exp $ bin/cmake-language-server-${PYVERSSUFFIX} -${PYSITELIB}/${EGG_INFODIR}/PKG-INFO -${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt -${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt -${PYSITELIB}/${EGG_INFODIR}/entry_points.txt -${PYSITELIB}/${EGG_INFODIR}/requires.txt -${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER +${PYSITELIB}/${WHEEL_INFODIR}/METADATA +${PYSITELIB}/${WHEEL_INFODIR}/RECORD +${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED +${PYSITELIB}/${WHEEL_INFODIR}/WHEEL +${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json +${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt +${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE ${PYSITELIB}/cmake_language_server/__init__.py ${PYSITELIB}/cmake_language_server/__init__.pyc -${PYSITELIB}/cmake_language_server/__init__.pyo ${PYSITELIB}/cmake_language_server/api.py ${PYSITELIB}/cmake_language_server/api.pyc -${PYSITELIB}/cmake_language_server/api.pyo ${PYSITELIB}/cmake_language_server/server.py ${PYSITELIB}/cmake_language_server/server.pyc -${PYSITELIB}/cmake_language_server/server.pyo +${PYSITELIB}/cmake_language_server/version.py +${PYSITELIB}/cmake_language_server/version.pyc diff --git a/lang/py-cmake-language-server/distinfo b/lang/py-cmake-language-server/distinfo index 20aa8019a0e6..d656ddbc56c4 100644 --- a/lang/py-cmake-language-server/distinfo +++ b/lang/py-cmake-language-server/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2022/08/10 11:42:58 adam Exp $ +$NetBSD: distinfo,v 1.6 2023/05/05 09:52:24 wiz Exp $ -BLAKE2s (cmake-language-server-0.1.6.tar.gz) = bb3607847f58d9f65af3001ccb729b6e273a7b40342d6b4af8002eedbc5c9604 -SHA512 (cmake-language-server-0.1.6.tar.gz) = 082646e9fa54efad5b3c80528f3d98a59157abb61b24bc7c3af1d7b976feae8505294606013acc6de612d8961378af0589b7a013ab9a78ddcfe2e7672f57fda3 -Size (cmake-language-server-0.1.6.tar.gz) = 9487 bytes +BLAKE2s (cmake-language-server-0.1.7.tar.gz) = 5c8b95c519d496a201e20d239231e5db96efea807563b0e6e170d1e91a4e9873 +SHA512 (cmake-language-server-0.1.7.tar.gz) = d8efcb0a3104f618e15a6b4b116713d2436f44bce1e816a7aceda6ea5b664479a6079ece21159f626feaf41ca2fb1812dc842390d2b45b71f556de267ad08090 +Size (cmake-language-server-0.1.7.tar.gz) = 11361 bytes +SHA1 (patch-pyproject.toml) = 324eaeb49451390cdfb0dde413c05dc857227ffc diff --git a/lang/py-cmake-language-server/patches/patch-pyproject.toml b/lang/py-cmake-language-server/patches/patch-pyproject.toml new file mode 100644 index 000000000000..9e81eefadcee --- /dev/null +++ b/lang/py-cmake-language-server/patches/patch-pyproject.toml @@ -0,0 +1,18 @@ +$NetBSD: patch-pyproject.toml,v 1.1 2023/05/05 09:52:24 wiz Exp $ + +Switch to pdm-backend + +--- pyproject.toml.orig 2023-03-09 10:01:30.924441300 +0000 ++++ pyproject.toml +@@ -38,9 +38,9 @@ cmake-language-server = "cmake_language_ + + [build-system] + requires = [ +- "pdm-pep517>=1.0.0", ++ "pdm-backend>=1.0.0", + ] +-build-backend = "pdm.pep517.api" ++build-backend = "pdm.backend" + + [tool.pdm.version] + source = "scm"