Date: Sunday, March 26, 2023 @ 09:03:51 Author: arojas Revision: 1428686
upgpkg: python-lsp-server 1.7.1-2: Make it compatible with our pydocstyle Added: python-lsp-server/trunk/ce913f16.patch Modified: python-lsp-server/trunk/PKGBUILD ----------------+ PKGBUILD | 13 ++++++++----- ce913f16.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-26 09:00:55 UTC (rev 1428685) +++ PKGBUILD 2023-03-26 09:03:51 UTC (rev 1428686) @@ -4,7 +4,7 @@ pkgname=python-lsp-server pkgver=1.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fork of the python-language-server project, maintained by the Spyder IDE team and the community" arch=(any) url="https://github.com/python-lsp/python-lsp-server"; @@ -42,8 +42,10 @@ python-pyqt5 python-appdirs ) -source=(https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha256sums=('67473bb301f35434b5fa8b21fc5ed5fac27dc8a8446ccec8bae456af52a0aef6') +source=(https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz + ce913f16.patch) +sha256sums=('67473bb301f35434b5fa8b21fc5ed5fac27dc8a8446ccec8bae456af52a0aef6' + '05cce14f51081854b33df34a22f0ecf07060c3195412cce49238f36d3cf1b05f') prepare() { cd ${pkgname}-${pkgver} @@ -52,6 +54,8 @@ sed 's|mccabe>=0.7.0,<0.8.0|mccabe>=0.7.0|' -i pyproject.toml sed 's|pycodestyle>=2.9.0,<2.11.0|pycodestyle>=2.9.0|' -i pyproject.toml sed 's|pyflakes>=2.5.0,<3.1.0|pyflakes>=2.5.0|' -i pyproject.toml + sed 's|pydocstyle>=6.2.0,<6.3.0|pydocstyle|' -i pyproject.toml + patch -Rp1 -i ../ce913f16.patch # Revert pydocstyle bump until package is updated } build() { @@ -63,8 +67,7 @@ cd ${pkgname}-${pkgver} # Disable coverage sed -i '/--cov/d' pyproject.toml - # Numpy completions broken with numpy 1.23 - pytest -vv --color=yes -k 'not test_numpy_completions and not test_pydocstyle_lint' + pytest -vv --color=yes } package() { Added: ce913f16.patch =================================================================== --- ce913f16.patch (rev 0) +++ ce913f16.patch 2023-03-26 09:03:51 UTC (rev 1428686) @@ -0,0 +1,26 @@ +From ce913f16359f03ffe4a60b6a2fe7ccae4b15bb4a Mon Sep 17 00:00:00 2001 +From: Carlos Cordoba <[email protected]> +Date: Wed, 4 Jan 2023 19:05:01 -0500 +Subject: [PATCH] Fix pydocstyle linting with its 6.2.0 version (#329) + +--- + pylsp/plugins/pydocstyle_lint.py | 4 ++-- + pyproject.toml | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pylsp/plugins/pydocstyle_lint.py b/pylsp/plugins/pydocstyle_lint.py +index 7f4e0723..0aa72b7c 100644 +--- a/pylsp/plugins/pydocstyle_lint.py ++++ b/pylsp/plugins/pydocstyle_lint.py +@@ -66,9 +66,9 @@ def pylsp_lint(config, workspace, document): + + # Will only yield a single filename, the document path + diags = [] +- for filename, checked_codes, ignore_decorators in conf.get_files_to_check(): ++ for filename, checked_codes, ignore_decorators, property_decorators in conf.get_files_to_check(): + errors = pydocstyle.checker.ConventionChecker().check_source( +- document.source, filename, ignore_decorators=ignore_decorators ++ document.source, filename, ignore_decorators=ignore_decorators, property_decorators=property_decorators + ) + + try:
