Date: Wednesday, July 29, 2020 @ 12:55:52 Author: archange Revision: 665769
upgpkg: spyder 4.1.4-1 Modified: spyder/trunk/PKGBUILD ----------+ PKGBUILD | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-07-29 12:30:10 UTC (rev 665768) +++ PKGBUILD 2020-07-29 12:55:52 UTC (rev 665769) @@ -4,8 +4,8 @@ # Contributor: TDY <t...@gmx.com> pkgname=spyder -pkgver=4.1.3 -pkgrel=2 +pkgver=4.1.4 +pkgrel=1 pkgdesc="The Scientific Python Development Environment" arch=(any) url="https://www.spyder-ide.org/"; @@ -70,10 +70,8 @@ tk ) source=(https://github.com/spyder-ide/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz - spyder-ignore-deps-tests.patch::https://github.com/spyder-ide/spyder/commit/833de4b928a5d2b28422d2c56a08e9217af6ad2a.patch spyder3_to_spyder.patch) -sha256sums=('a55f5323c2be2813f52a5941ed65eb98f5bb81cc31df464374965d389ba24fd9' - '426d1228a52c02ce77dcf3904ca07c024a0f23f019e79984b9563b47bf9164d1' +sha256sums=('2fcb9167468547ebc713658f35ac7a4c91b75c4cff19d1aa1913c227b49fb763' '42b51d2696f06e4ad69be7379e913fd90e5c09c3e8244b6f38ef127ae86cfe89') prepare() { @@ -83,11 +81,9 @@ mv scripts/spyder{3,}.desktop mv scripts/spyder{3,}.appdata.xml # Allow our jedi and parso versions - sed -i "s|JEDI_REQVER = '=0.15.2'|JEDI_REQVER = '>=0.15.2'|" -i spyder/dependencies.py - sed -i "s|PARSO_REQVER = '=0.5.2'|PARSO_REQVER = '>=0.5.2'|" -i spyder/dependencies.py - sed -i "s|PYLS_REQVER = '>=0.31.9;<0.32.0'|PYLS_REQVER = '>=0.31.9'|" -i spyder/dependencies.py - # Fix test failure in uneeded subtests - patch -p1 -i ../spyder-ignore-deps-tests.patch + sed -i "s|JEDI_REQVER = '=0.17.1'|JEDI_REQVER = '>=0.17.0'|" -i spyder/dependencies.py + sed -i "s|PARSO_REQVER = '=0.7.0'|PARSO_REQVER = '>=0.7.0'|" -i spyder/dependencies.py + sed -i "s|PYLS_REQVER = '>=0.34.0;<1.0.0'|PYLS_REQVER = '>=0.34.0'|" -i spyder/dependencies.py } build() { @@ -98,14 +94,14 @@ check() { cd ${pkgname}-${pkgver} # Required per above patching - sed -i "s|jedi==0.15.2|jedi>=0.15.2|" -i setup.py - sed -i "s|parso==0.5.2|parso>=0.5.2|" -i setup.py - sed -i "s|python-language-server[all]>=0.31.9,<0.32.0|python-language-server[all]>=0.31.9|" -i setup.py - sed -i "s|jedi =0.15.2|jedi >=0.15.2|" -i requirements/conda.txt - sed -i "s|parso =0.5.2|parso >=0.5.2|" -i requirements/conda.txt - sed -i "s|jedi =0.15.2|jedi >=0.15.2|" -i binder/environment.yml - sed -i "s|parso =0.5.2|parso >=0.5.2|" -i binder/environment.yml - sed -i "s|python-language-server >=0.31.9,<0.32.0|python-language-server >=0.31.9|" -i binder/environment.yml + sed -i "s|jedi==0.17.1|jedi>=0.17.0|" -i setup.py + sed -i "s|parso==0.7.0|parso>=0.7.0|" -i setup.py + sed -i "s|python-language-server[all]>=0.34.0,<1.0.0|python-language-server[all]>=0.34.0|" -i setup.py + sed -i "s|jedi =0.17.1|jedi >=0.17.0|" -i requirements/conda.txt + sed -i "s|parso =0.7.0|parso >=0.7.0|" -i requirements/conda.txt + sed -i "s|jedi =0.17.1|jedi >=0.17.0|" -i binder/environment.yml + sed -i "s|parso =0.7.0|parso >=0.7.0|" -i binder/environment.yml + sed -i "s|python-language-server >=0.34.0,<1.0.0|python-language-server >=0.34.0|" -i binder/environment.yml # Some tests failures but upstream does not support us python runtests.py || warning "Tests failed" }
