From 384e1983041094c8487d394f59dfe8a6848d60f2 Mon Sep 17 00:00:00 2001 From: Alec Scott Date: Thu, 21 Mar 2024 02:36:15 -0700 Subject: [PATCH] py-python-lsp-server: add v1.10.0 (#42799) * py-python-lsp-server: add v1.10.0 * Apply suggestions from code review Co-authored-by: Adam J. Stewart * Remove py-wheel from package * Apply suggestions from code review Co-authored-by: Adam J. Stewart --------- Co-authored-by: Adam J. Stewart --- .../packages/py-python-lsp-jsonrpc/package.py | 4 ++++ .../packages/py-python-lsp-server/package.py | 13 ++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-python-lsp-jsonrpc/package.py b/var/spack/repos/builtin/packages/py-python-lsp-jsonrpc/package.py index 9c507d367d..e3ec86ab1a 100644 --- a/var/spack/repos/builtin/packages/py-python-lsp-jsonrpc/package.py +++ b/var/spack/repos/builtin/packages/py-python-lsp-jsonrpc/package.py @@ -16,7 +16,11 @@ class PyPythonLspJsonrpc(PythonPackage): license("MIT") + version("1.1.2", sha256="4688e453eef55cd952bff762c705cedefa12055c0aec17a06f595bcc002cc912") version("1.0.0", sha256="7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd") depends_on("py-setuptools", type="build") + depends_on("py-setuptools@61.2.0:", type="build", when="@1.1.0:") + depends_on("py-setuptools-scm@3.4.3:+toml", type="build", when="@1.1.0:") + depends_on("py-ujson@3.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-lsp-server/package.py b/var/spack/repos/builtin/packages/py-python-lsp-server/package.py index 1292ae77fe..3c1e23e990 100644 --- a/var/spack/repos/builtin/packages/py-python-lsp-server/package.py +++ b/var/spack/repos/builtin/packages/py-python-lsp-server/package.py @@ -16,15 +16,22 @@ class PyPythonLspServer(PythonPackage): license("MIT") + version("1.10.0", sha256="0c9a52dcc16cd0562404d529d50a03372db1ea6fb8dfcc3792b3265441c814f4") version("1.7.1", sha256="67473bb301f35434b5fa8b21fc5ed5fac27dc8a8446ccec8bae456af52a0aef6") version("1.7.0", sha256="401ce78ea2e98cadd02d94962eb32c92879caabc8055b9a2f36d7ef44acc5435") version("1.6.0", sha256="d75cdff9027c4212e5b9e861e9a0219219c8e2c69508d9f24949951dabd0dc1b") depends_on("python@3.7:", type=("build", "run")) - depends_on("py-setuptools@61.2.0:", type=("build", "run")) + depends_on("python@3.8:", type=("build", "run"), when="@1.8.0:") + depends_on("py-setuptools@61.2.0:", type=("build", "run"), when="@:1.7") + depends_on("py-setuptools@61.2.0:", type="build", when="@1.8.0:") depends_on("py-setuptools-scm@3.4.3:+toml", type="build") + depends_on("py-docstring-to-markdown", type=("build", "run")) - depends_on("py-jedi@0.17.2:0.18", type=("build", "run")) + depends_on("py-importlib-metadata@4.8.3:", type=("build", "run"), when="@1.8.0: ^python@:3.9") + depends_on("py-jedi@0.17.2:0.18", type=("build", "run"), when="@:1.7") + depends_on("py-jedi@0.17.2:0.19", type=("build", "run"), when="@1.8.0:") depends_on("py-pluggy@1.0.0:", type=("build", "run")) - depends_on("py-python-lsp-jsonrpc@1.0.0:", type=("build", "run")) + depends_on("py-python-lsp-jsonrpc@1.0.0:1", type=("build", "run")) + depends_on("py-python-lsp-jsonrpc@1.1.0:1", type=("build", "run"), when="@1.8.0:") depends_on("py-ujson@3.0.0:", type=("build", "run"))