From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E86B41382C5 for ; Thu, 20 May 2021 08:47:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DF6BE088C; Thu, 20 May 2021 08:47:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 891FEE088C for ; Thu, 20 May 2021 08:47:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DCE0340D8B for ; Thu, 20 May 2021 08:47:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CEBA1729 for ; Thu, 20 May 2021 08:47:08 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1621500425.6f77ea71c35f2bcea2d61d4e4706f489940ce138.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-lsp-server/files/, dev-python/python-lsp-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/python-lsp-server/files/pyls-fix-test_folding.patch dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild X-VCS-Directories: dev-python/python-lsp-server/files/ dev-python/python-lsp-server/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 6f77ea71c35f2bcea2d61d4e4706f489940ce138 X-VCS-Branch: master Date: Thu, 20 May 2021 08:47:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 19974b0f-23ae-4739-b9c1-fe2896dc1ef3 X-Archives-Hash: 6110cf2cf13ffae64f8d9c832f4162c4 commit: 6f77ea71c35f2bcea2d61d4e4706f489940ce138 Author: Andrew Ammerlaan gentoo org> AuthorDate: Thu May 20 08:46:04 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu May 20 08:47:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f77ea71 dev-python/python-lsp-server: fix the tests (again) See https://github.com/python-lsp/python-lsp-server/pull/9 Closes: https://bugs.gentoo.org/791166 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> .../python-lsp-server/files/pyls-fix-test_folding.patch | 14 -------------- .../python-lsp-server/python-lsp-server-1.0.1.ebuild | 1 - 2 files changed, 15 deletions(-) diff --git a/dev-python/python-lsp-server/files/pyls-fix-test_folding.patch b/dev-python/python-lsp-server/files/pyls-fix-test_folding.patch deleted file mode 100644 index d70f2b23d4b..00000000000 --- a/dev-python/python-lsp-server/files/pyls-fix-test_folding.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/test/plugins/test_folding.py b/test/plugins/test_folding.py -index 57d6e2e..cef4583 100644 ---- a/test/plugins/test_folding.py -+++ b/test/plugins/test_folding.py -@@ -147,9 +147,6 @@ def test_folding(workspace): - {'startLine': 62, 'endLine': 63}, - {'startLine': 64, 'endLine': 65}, - {'startLine': 67, 'endLine': 68}] -- if sys.version_info[:2] >= (3, 9): -- # the argument list of the decorator is also folded in Python >= 3.9 -- expected.insert(4, {'startLine': 9, 'endLine': 10}) - - assert ranges == expected - diff --git a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild index bacdb5db84f..ef8e5c76b26 100644 --- a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild +++ b/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild @@ -45,7 +45,6 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/pyls-fix-test_folding.patch" "${FILESDIR}/pyls-fix-test-with-pylint28.patch" )