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

[Bruno Pagani]

    Date: Saturday, April 2, 2022 @ 21:32:55
  Author: archange
Revision: 1180876

upgpkg: spyder 5.3.0-1

Modified:
  spyder/trunk/PKGBUILD

----------+
 PKGBUILD |   57 +++++++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 20:57:43 UTC (rev 1180875)
+++ PKGBUILD	2022-04-02 21:32:55 UTC (rev 1180876)
@@ -4,13 +4,13 @@
 # Contributor: TDY <tdy at gmx.com>
 
 pkgname=spyder
-pkgver=5.2.2
+pkgver=5.3.0
 pkgrel=1
 pkgdesc="The Scientific Python Development Environment"
 arch=(any)
 url="https://www.spyder-ide.org/"
 license=(MIT)
-makedepends=(python-sphinx)
+makedepends=(python-sphinx python-setuptools-scm python-wheel)
 depends=(
     python-atomicwrites
     python-chardet
@@ -73,7 +73,6 @@
     python-pytest-qt
     python-pytest-mock
     python-pytest-cov
-    python-pytest-xvfb
     python-pytest-order
     python-pytest-lazy-fixture
     python-flaky
@@ -85,30 +84,28 @@
     cython
     git
     tk
+    xorg-server-xvfb
 )
 source=(https://github.com/spyder-ide/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha512sums=('e88a1332da503fcbd55496b7600a7b7dbfa5aa8d2d248b2f4a6cb4e394c07a38b6681db3ac7c0997ff87984a561f1d794a5bec6492f7c7c131c5cfee55c445b2')
+sha512sums=('c556deb8bed91ad6c59761e70e1e69f2402a216d8c87a57b3fc55f3624418d95114b015f5fc5baf0cb7e405955cd2ae82372105830b405ea52c50d7329ba7f42')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   # Allow our python libraries versions
-  sed 's|IPYTHON_REQVER = ">=7.6.0;<8.0.0"|IPYTHON_REQVER = ">=7.6.0"|' -i spyder/dependencies.py
+  sed 's|IPYTHON_REQVER = ">=7.31.1;<8.0.0"|IPYTHON_REQVER = ">=7.31.1"|' -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|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|PYLSP_REQVER = '>=1.4.1;<1.5.0'|PYLSP_REQVER = '>=1.4.1'|" -i spyder/dependencies.py
+  sed "s|QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0'|QDARKSTYLE_REQVER = '>=3.0.2'|" -i spyder/dependencies.py
+  sed "s|QTCONSOLE_REQVER = '>=5.3.0;<5.4.0'|QTCONSOLE_REQVER = '>=5.3.0'|" -i spyder/dependencies.py
+  sed "s|ipython>=7.31.1,<8.0.0|ipython>=7.31.1|" -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
+  sed "s|python-lsp-server\[all\]>=1.4.1,<1.5.0|python-lsp-server\[all\]>=1.4.1|" -i setup.py
+  sed "s|qdarkstyle>=3.0.2,<3.1.0|qdarkstyle>=3.0.2|" -i setup.py
+  sed "s|qtconsole>=5.3.0,<5.4.0|qtconsole>=5.3.0|" -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
 }
 
 build() {
@@ -119,34 +116,34 @@
 check() {
   cd ${pkgname}-${pkgver}
   # Required per above patching
-  sed "s|ipython >=7.6.0,<8.0.0|ipython >=7.6.0|" -i binder/environment.yml
+  sed "s|ipython >=7.31.1,<8.0.0|ipython >=7.31.1|" -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|IPython >=7.6.0,<8.0.0|IPython >=7.6.0|" -i requirements/conda.txt
+  sed "s|python-lsp-server >=1.4.1,<1.5.0|python-lsp-server >=1.4.1|" -i binder/environment.yml
+  sed "s|qdarkstyle >=3.0.2,<3.1.0|qdarkstyle >=3.0.2|" -i binder/environment.yml
+  sed "s|qtconsole >=5.3.0,<5.4.0|qtconsole >=5.3.0|" -i binder/environment.yml
+  sed "s|IPython >=7.31.1,<8.0.0|IPython >=7.31.1|" -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
+  sed "s|python-lsp-server >=1.4.1,<1.5.0|python-lsp-server >=1.4.1|" -i requirements/conda.txt
+  sed "s|qdarkstyle >=3.0.2,<3.1.0|qdarkstyle >=3.0.2|" -i requirements/conda.txt
+  sed "s|qtconsole >=5.3.0,<5.4.0|qtconsole >=5.3.0|" -i requirements/conda.txt
   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+='not test_config_dialog'
   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_delete_line_shortcut'
+  disabled_tests+=' and not test_go_to_line_shortcut'
+  disabled_tests+=' and not test_transform_to_lowercase_shortcut'
+  disabled_tests+=' and not test_transform_to_uppercase_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"
+  # Same ipykernel failures as in spyder-kernels
+  xvfb-run --auto-servernum python runtests.py --color=yes -k "${disabled_tests}" || echo "Tests failed"
 }
 
 package() {