From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- dev-python/spyder/Manifest | 2 +- dev-python/spyder/spyder-5.0.5.ebuild | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'dev-python/spyder') diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest index d8a3bd85267c..356c20e891e1 100644 --- a/dev-python/spyder/Manifest +++ b/dev-python/spyder/Manifest @@ -7,5 +7,5 @@ DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a DIST spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz 78446300 BLAKE2B 4225589581ef47237d7025f506812840c959e589cddfe47d2c4d3a74d7fc876f67eda291ad07e82b054ff2666bed34fa0edca1e1c0e1ff5574efb2db1028a42a SHA512 4d0bd348ec3335e022456c19dc319295948061cea45b0f1e5a05c2640943776b5c3bdc2581fdc0571bd98fe8834af035134084394ce6711d5a69598515bd0e9b DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d EBUILD spyder-4.2.5-r1.ebuild 10176 BLAKE2B a80d3e881f43d2300d4607fff4151118d747402de298f8e3c3dd5b7aecd5987c850e60cf4c1ef5346eab40163e4117abad0a3056744c0aca777f0b5fa6f7a6fc SHA512 cf8b9310b1e7af89b78257389f6b7934c51a5f5585fa69931f2b81536f1e4089844b9a24c606d9119a66c99ca3648a3f160bedf21ce3b98714b3af7474a1d2e4 -EBUILD spyder-5.0.5.ebuild 7876 BLAKE2B 9005dce5299217245eeca798b03aa61b0c64025bf7ecf94e6b9658eab463e4758fd58f92a70795249ce61e1697381183de728494ef15107bfdfae73ea0ebcff8 SHA512 856c5fbff97300dfba3c4522aa9ac959e42a84e861181659e73513b2feeb1f61540ca4a3c8f265e36380ada7641983b48e3726da61085f26a1b7b123cd1516b2 +EBUILD spyder-5.0.5.ebuild 8065 BLAKE2B f844924aa8896b66229e842ded6e2d3904e81415e18ca0aba398575702da35242f57e8a26a690e0091fe8f5ebfad7e9fd067334881e6c0ab1432cc680e8c228a SHA512 11b32aa695f0df8caaa98a304c547ea300eafbc14e61b1149099a266dd2198ab44b0c0041be1927db972da3ae9a441df5d66274bef471856fb207f9c9d8c8afc MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08 diff --git a/dev-python/spyder/spyder-5.0.5.ebuild b/dev-python/spyder/spyder-5.0.5.ebuild index eb12c15ca98a..27d30b0d5a4c 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/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 -- cgit v1.2.3