From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1298436-garchives=archives.gentoo.org@lists.gentoo.org>
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 3ED5913933E
for <garchives@archives.gentoo.org>; Fri, 2 Jul 2021 11:49:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 42BEFE085A;
Fri, 2 Jul 2021 11:49:27 +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 B0553E0866
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jul 2021 11:49:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 6A14C335DCB
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jul 2021 11:49:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C39E2B
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jul 2021 11:49:23 +0000 (UTC)
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
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" <andrewammerlaan@gentoo.org>
Message-ID: <1625226558.1e9f01bf1d97ba8a52a2d90ddccfe108787e1c92.andrewammerlaan@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/spyder/spyder-5.0.5.ebuild
X-VCS-Directories: dev-python/spyder/
X-VCS-Committer: andrewammerlaan
X-VCS-Committer-Name: Andrew Ammerlaan
X-VCS-Revision: 1e9f01bf1d97ba8a52a2d90ddccfe108787e1c92
X-VCS-Branch: master
Date: Fri, 2 Jul 2021 11:49:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3d0c9235-cdfa-4e28-8251-a929d8b43106
X-Archives-Hash: 8c4099f1fdf23875dc6d943a667730e9
commit: 1e9f01bf1d97ba8a52a2d90ddccfe108787e1c92
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 2 11:26:11 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jul 2 11:49:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9f01bf
dev-python/spyder: allow parso 0.7.1
Otherwise we get stuck in a dependency conflict with python_targets_python3_10
Closes: https://bugs.gentoo.org/743466
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/spyder/spyder-5.0.5.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-python/spyder/spyder-5.0.5.ebuild b/dev-python/spyder/spyder-5.0.5.ebuild
index eb12c15ca98..27d30b0d5a4 100644
--- a/dev-python/spyder/spyder-5.0.5.ebuild
+++ b/dev-python/spyder/spyder-5.0.5.ebuild
@@ -46,7 +46,8 @@ RDEPEND="
>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
- ~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/parso-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/parso-0.8.0[${PYTHON_USEDEP}]
>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
@@ -145,6 +146,7 @@ python_prepare_all() {
# The original hasn't been update in over 6 months, and spyder upstream is slow
# in making the switch. Because we are running into issues with outdated deps
# and a whole dependency mess as a result, we can no longer wait for upstream.
+ # Also relax the parso dependency to allow parso 0.7.1
find . -name "*.py" -exec sed -i \
-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
-e 's/python-language-server/python-lsp-server/g' \
@@ -158,6 +160,8 @@ python_prepare_all() {
-e 's/pylsp-black/python-lsp-black/g' \
-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
+ -e "s/'parso==0.7.0'/'parso>=0.7.0,<0.8.0'/g" \
+ -e "s/'=0.7.0'/'>=0.7.0;<0.8.0'/g" \
{} + || die
# do not depend on pyqt5<13