[arch-commits] Commit in spyder/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Sunday, March 20, 2022 @ 21:45:35
  Author: archange
Revision: 1166265

upgpkg: spyder 5.2.2-1

Remove more upper bounds + attempt at running tests correctly

Modified:
  spyder/trunk/PKGBUILD

----------+
 PKGBUILD |   57 +++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-20 21:38:35 UTC (rev 1166264)
+++ PKGBUILD	2022-03-20 21:45:35 UTC (rev 1166265)
@@ -4,8 +4,8 @@
 # Contributor: TDY <tdy at gmx.com>
 
 pkgname=spyder
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.2.2
+pkgrel=1
 pkgdesc="The Scientific Python Development Environment"
 arch=(any)
 url="https://www.spyder-ide.org/"
@@ -87,20 +87,28 @@
     tk
 )
 source=(https://github.com/spyder-ide/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha512sums=('9298c845a17f348bccbe93451f03aef0d4ee2bde2d3025ac7ed695b3e3c3941cb9852f7c56d676ca022a37020a647c93977e0845fe6f5686dd2598236a9c7d9c')
+sha512sums=('e88a1332da503fcbd55496b7600a7b7dbfa5aa8d2d248b2f4a6cb4e394c07a38b6681db3ac7c0997ff87984a561f1d794a5bec6492f7c7c131c5cfee55c445b2')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   # Allow our python libraries versions
-  #sed "s|JEDI_REQVER = '=|JEDI_REQVER = '>=|" -i spyder/dependencies.py
-  #sed "s|PARSO_REQVER = '=|PARSO_REQVER = '>=|" -i spyder/dependencies.py
+  sed 's|IPYTHON_REQVER = ">=7.6.0;<8.0.0"|IPYTHON_REQVER = ">=7.6.0"|' -i spyder/dependencies.py
+  sed "s|JEDI_REQVER = '>=0.17.2;<0.19.0'|JEDI_REQVER = '>=0.17.2'|" -i spyder/dependencies.py
+  sed "s|PARSO_REQVER = '>=0.7.0;<0.9.0'|PARSO_REQVER = '>=0.7.0'|" -i spyder/dependencies.py
+  sed "s|PYLSP_REQVER = '>=1.3.2;<1.4.0'|PYLSP_REQVER = '>=1.3.2'|" -i spyder/dependencies.py
   sed "s|QDARKSTYLE_REQVER = '=|QDARKSTYLE_REQVER = '>=|" -i spyder/dependencies.py
-  #sed "s|jedi==|jedi>=|" -i setup.py
-  #sed "s|parso==|parso>=|" -i setup.py
+  sed "s|QTCONSOLE_REQVER = '>=5.2.1;<5.3.0'|QTCONSOLE_REQVER = '>=5.2.1'|" -i spyder/dependencies.py
+  sed "s|ipython>=7.6.0,<8.0.0|ipython>=7.6.0|" -i setup.py
+  sed "s|jedi>=0.17.2,<0.19.0|jedi>=0.17.2|" -i setup.py
+  sed "s|parso>=0.7.0,<0.9.0|parso>=0.7.0|" -i setup.py
+  sed "s|python-lsp-server\[all\]>=1.3.2,<1.4.0|python-lsp-server\[all\]>=1.3.2|" -i setup.py
   sed "s|qdarkstyle==|qdarkstyle>=|" -i setup.py
+  sed "s|qtconsole>=5.2.1,<5.3.0|qtconsole>=5.2.1|" -i setup.py
+  # Required change for ipython
+  sed "s|extra_extension|extra_extensions|" -i spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py
   # Allow our Qt version
-  sed "s|'pyqt5<5.13'|'pyqt5'|" -i setup.py
-  sed "s|'pyqtwebengine<5.13'|'pyqtwebengine'|" -i setup.py
+  sed "s|pyqt5<5.13|pyqt5|" -i setup.py
+  sed "s|pyqtwebengine<5.13|pyqtwebengine|" -i setup.py
 }
 
 build() {
@@ -111,17 +119,34 @@
 check() {
   cd ${pkgname}-${pkgver}
   # Required per above patching
-  #sed "s|jedi =|jedi >=|" -i binder/environment.yml
-  #sed "s|parso =|parso >=|" -i binder/environment.yml
+  sed "s|ipython >=7.6.0,<8.0.0|ipython >=7.6.0|" -i binder/environment.yml
+  sed "s|jedi >=0.17.2,<0.19.0|jedi >=0.17.2|" -i binder/environment.yml
+  sed "s|parso >=0.7.0,<0.9.0|parso >=0.7.0|" -i binder/environment.yml
+  sed "s|python-lsp-server >=1.3.2,<1.4.0|python-lsp-server >=1.3.2|" -i binder/environment.yml
   sed "s|qdarkstyle =|qdarkstyle >=|" -i binder/environment.yml
+  sed "s|qtconsole >=5.2.1,<5.3.0|qtconsole >=5.2.1|" -i binder/environment.yml
   sed "s|pyqt <5.13|pyqt|" -i binder/environment.yml
-  #sed "s|jedi =|jedi >=|" -i requirements/conda.txt
-  #sed "s|parso =|parso >=|" -i requirements/conda.txt
+  sed "s|IPython >=7.6.0,<8.0.0|IPython >=7.6.0|" -i requirements/conda.txt
+  sed "s|jedi >=0.17.2,<0.19.0|jedi >=0.17.2|" -i requirements/conda.txt
+  sed "s|parso >=0.7.0,<0.9.0|parso >=0.7.0|" -i requirements/conda.txt
+  sed "s|python-lsp-server >=1.3.2,<1.4.0|python-lsp-server >=1.3.2|" -i requirements/conda.txt
   sed "s|qdarkstyle =|qdarkstyle >=|" -i requirements/conda.txt
+  sed "s|qtconsole >=5.2.1,<5.3.0|qtconsole >=5.2.1|" -i requirements/conda.txt
   sed "s|pyqt <5.13|pyqt|" -i requirements/conda.txt
-  # Failures from Qt5.12-targeted tests, non-CI tests, etc.
-  # Some even segfaults, but upstream does not support us
-  python runtests.py --color=yes || echo "Tests failed"
+  local disabled_tests=''
+  # We have a(n up-to-date and) fixed Qt
+  disabled_tests+='not test_qtbug35861'
+  # Not working in headless env
+  disabled_tests+=' and not test_tab_copies_find_to_replace'
+  disabled_tests+=' and not test_toggle_off_show_all_files'
+  disabled_tests+=' and not test_select_all_shortcut'
+  disabled_tests+=' and not test_ctrl_c_dbg'
+  disabled_tests+=' and not test_connection_dialog_remembers_input_with_ssh_passphrase'
+  disabled_tests+=' and not test_connection_dialog_remembers_input_with_password' 
+  disabled_tests+=' and not test_store_user_credentials'
+  disabled_tests+=' and not test_config_dialog'
+  # Currently tests passes, but the testsuite crashes when terminating
+  python runtests.py --color=yes -k "${disabled_tests}" || echo "Testsuite crashed or tests failed"
 }
 
 package() {