| 1 |
commit: 1e9f01bf1d97ba8a52a2d90ddccfe108787e1c92 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 2 11:26:11 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 2 11:49:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9f01bf |
| 7 |
|
| 8 |
dev-python/spyder: allow parso 0.7.1 |
| 9 |
|
| 10 |
Otherwise we get stuck in a dependency conflict with python_targets_python3_10 |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/743466 |
| 13 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 14 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-python/spyder/spyder-5.0.5.ebuild | 6 +++++- |
| 17 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-python/spyder/spyder-5.0.5.ebuild b/dev-python/spyder/spyder-5.0.5.ebuild |
| 20 |
index eb12c15ca98..27d30b0d5a4 100644 |
| 21 |
--- a/dev-python/spyder/spyder-5.0.5.ebuild |
| 22 |
+++ b/dev-python/spyder/spyder-5.0.5.ebuild |
| 23 |
@@ -46,7 +46,8 @@ RDEPEND=" |
| 24 |
>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}] |
| 25 |
>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}] |
| 26 |
>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}] |
| 27 |
- ~dev-python/parso-0.7.0[${PYTHON_USEDEP}] |
| 28 |
+ >=dev-python/parso-0.7.0[${PYTHON_USEDEP}] |
| 29 |
+ <dev-python/parso-0.8.0[${PYTHON_USEDEP}] |
| 30 |
>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}] |
| 31 |
>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}] |
| 32 |
>=dev-python/psutil-5.3[${PYTHON_USEDEP}] |
| 33 |
@@ -145,6 +146,7 @@ python_prepare_all() { |
| 34 |
# The original hasn't been update in over 6 months, and spyder upstream is slow |
| 35 |
# in making the switch. Because we are running into issues with outdated deps |
| 36 |
# and a whole dependency mess as a result, we can no longer wait for upstream. |
| 37 |
+ # Also relax the parso dependency to allow parso 0.7.1 |
| 38 |
find . -name "*.py" -exec sed -i \ |
| 39 |
-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \ |
| 40 |
-e 's/python-language-server/python-lsp-server/g' \ |
| 41 |
@@ -158,6 +160,8 @@ python_prepare_all() { |
| 42 |
-e 's/pylsp-black/python-lsp-black/g' \ |
| 43 |
-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \ |
| 44 |
-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \ |
| 45 |
+ -e "s/'parso==0.7.0'/'parso>=0.7.0,<0.8.0'/g" \ |
| 46 |
+ -e "s/'=0.7.0'/'>=0.7.0;<0.8.0'/g" \ |
| 47 |
{} + || die |
| 48 |
|
| 49 |
# do not depend on pyqt5<13 |
Archives