From nobody Tue May 23 18:48:39 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QQjyH6c2Mz4Cp3v; Tue, 23 May 2023 18:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QQjyH63dNz3JmY; Tue, 23 May 2023 18:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684867719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fwlxp81A5VNHH6B6LuXxHaBq/KZtScGAmSb83LNEJQI=; b=KYLsEs2iF5s6KGJjvDQOR+FvLxtTwdYU0KNfsEKVfcRPfCaLTLD6XSxUvo8g1HyS1A2RON +28rbDXp76T2iO9KOGSz9L0WgLKqxx/bfFNay3JdOavQf45tSiW2HPeH4CLkhDIA4B10pj ko61BZFBeHR7dgJFwRBIhkgqRCbmXUBBj7VNHfs/3B2dVJiq73DSrSAkTJEcHhr1WxZAQ2 tzOop33JOLYRIlo3lKI0AqVh9np201U1QMTZFcHxsSF0E1NwFIXvJI64HJIqqWhz6piZRy W/EK9Z509qM0kpsfUsH1at4JvCfVf/yKWweFqh9iHG1v/3acBHr7GgH7/ecTww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684867719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fwlxp81A5VNHH6B6LuXxHaBq/KZtScGAmSb83LNEJQI=; b=rrhXdufy3M/z1xxVFyAN/D/JKXl1FPqaR6jVzhbddkk+ikIhIQh5RKYM4C6ECuhK0Z4UUu vvFXdNmuVVNFQj/t54QdDeGslcZvrWk6KtY0sKleurnDptBSw9GeLugMwQoKE8Qxs8/5d+ 3Ns65iLGFxNd5DVyFK62eOrrTYrj1hX2Okw1PGMQYK5szd+c8w53gnSAoPMZyMjY4AtJjU EweEVPwOaV6XPjOc2/NHRSIIM4Jz8FIyeMn6scAwcKGg6sJKr5gDoI+Gc8mLs2a5TCsdiN nabzuQw+TkmxWBbPBZu+MEF/bJQ9nNOiDW1GMNXULhiwwHOc2pbWujkAoA5O1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684867719; a=rsa-sha256; cv=none; b=j9WzxPtqT11PryckvpEgvs0CGa/Y6d7Qu4xyvMz1k5kYCjkYubzzzgFOpOu+A2/ufbkQD/ m7d/am3X5+vOyIWGZTIZv9/9UcGnuiecSprPcRcsh/PevbThxUTHg4lGHjxTXQ+c7rN84g L+6dZ7zPasfMVAtMaOe8InDfg0aSi2EE06S19PQBpHGxnTG6m/LvLkfIBRBnGDTGXSwSUQ q3r3lwwin5g4zRp0oEjW1uDi8P8qpKA75+1bJcevv9ov0kBsJPagVxuMk78DwmrdwOKW4n aNpxH4gLQPr+/oNvz2I+Bc+ctaG4NyQlzcnX5M340g8W/Ki9OJIAsPCMwA/Saw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QQjyH57TGz19rW; Tue, 23 May 2023 18:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34NImd0U045466; Tue, 23 May 2023 18:48:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NImdVH045465; Tue, 23 May 2023 18:48:39 GMT (envelope-from git) Date: Tue, 23 May 2023 18:48:39 GMT Message-Id: <202305231848.34NImdVH045465@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rainer Hurling Subject: git: eadeffc39e43 - 2023Q2 - textproc/py-python-lsp-server: Loose version of dependency List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: eadeffc39e4343884a93b74539f6de8c4a79786a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=eadeffc39e4343884a93b74539f6de8c4a79786a commit eadeffc39e4343884a93b74539f6de8c4a79786a Author: Rainer Hurling AuthorDate: 2023-05-23 18:38:08 +0000 Commit: Rainer Hurling CommitDate: 2023-05-23 18:48:09 +0000 textproc/py-python-lsp-server: Loose version of dependency Allow older version of dependency yapf to make devel/spyder work: pkg_resources.ContextualVersionConflict: (yapf 0.32.0 (/usr/local/lib/python3.9/site-packages), Requirement.parse('yapf>=0.33.0; extra == "all"'), {'python-lsp-server'}) MFH: 2023Q2 (cherry picked from commit 789a78c3239b466f19d3d04c7d6dec003d707837) --- textproc/py-python-lsp-server/Makefile | 1 + textproc/py-python-lsp-server/files/patch-pyproject.toml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/textproc/py-python-lsp-server/Makefile b/textproc/py-python-lsp-server/Makefile index 2936022266e3..1f41ba359e29 100644 --- a/textproc/py-python-lsp-server/Makefile +++ b/textproc/py-python-lsp-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= python-lsp-server PORTVERSION= 1.7.3 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-python-lsp-server/files/patch-pyproject.toml b/textproc/py-python-lsp-server/files/patch-pyproject.toml index 12616c1b0d1a..0167777c29b4 100644 --- a/textproc/py-python-lsp-server/files/patch-pyproject.toml +++ b/textproc/py-python-lsp-server/files/patch-pyproject.toml @@ -19,7 +19,8 @@ + "pyflakes>=2.5.0", + "pylint>=2.5.0", "rope>1.2.0", - "yapf>=0.33.0", +- "yapf>=0.33.0", ++ "yapf>=0.32.0", "whatthepatch>=1.0.2,<2.0.0" ] -autopep8 = ["autopep8>=1.6.0,<2.1.0"] @@ -38,7 +39,7 @@ +pylint = ["pylint>=2.5.0"] rope = ["rope>1.2.0"] -yapf = ["yapf>=0.33.0", "whatthepatch>=1.0.2,<2.0.0"] -+yapf = ["yapf>=0.33.0", "whatthepatch>=1.0.2"] ++yapf = ["yapf>=0.32.0", "whatthepatch>=1.0.2"] websockets = ["websockets>=10.3"] test = [ - "pylint>=2.5.0,<3",