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

[Bruno Pagani]

    Date: Thursday, December 24, 2020 @ 14:38:59
  Author: archange
Revision: 788172

upgpkg: spyder 4.2.1-1

Modified:
  spyder/trunk/PKGBUILD
Deleted:
  spyder/trunk/spyder3_to_spyder.patch

-------------------------+
 PKGBUILD                |   44 ++++++++++++++++++++++----------------------
 spyder3_to_spyder.patch |   43 -------------------------------------------
 2 files changed, 22 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-24 14:37:40 UTC (rev 788171)
+++ PKGBUILD	2020-12-24 14:38:59 UTC (rev 788172)
@@ -4,13 +4,13 @@
 # Contributor: TDY <tdy at gmx.com>
 
 pkgname=spyder
-pkgver=4.1.5
-pkgrel=3
+pkgver=4.2.1
+pkgrel=1
 pkgdesc="The Scientific Python Development Environment"
 arch=(any)
 url="https://www.spyder-ide.org/"
 license=(MIT)
-makedepends=(python-setuptools python-sphinx)
+makedepends=(python-sphinx)
 depends=(
     python-atomicwrites
     python-chardet
@@ -19,6 +19,7 @@
     python-intervaltree
     ipython
     python-jedi
+    python-jsonschema
     python-keyring
     jupyter-nbconvert
     python-numpydoc
@@ -32,6 +33,8 @@
     python-pyqtwebengine
     qt5-webkit
     python-language-server
+    python-pyls-black
+    python-pyls-spyder
     python-xdg
     python-pyzmq
     python-qdarkstyle
@@ -38,8 +41,11 @@
     python-qtawesome
     python-qtconsole
     python-qtpy
+    python-setuptools
     python-sphinx
     python-spyder-kernels
+    python-textdistance
+    python-three-merge
     python-watchdog
 )
 optdepends=(
@@ -69,21 +75,15 @@
     git
     tk
 )
-source=(https://github.com/spyder-ide/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
-        spyder3_to_spyder.patch)
-sha256sums=('98f24bd782e2c5d2fcd1033b433692e85dada9f095f86547ba66728e5a26a65f'
-            '42b51d2696f06e4ad69be7379e913fd90e5c09c3e8244b6f38ef127ae86cfe89')
+source=(https://github.com/spyder-ide/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('0231a3b0ba0530817e53b5162ce0c3db8c98f071a0e4d4b6027721bf32039e2b')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  # Replace spyder3 with spyder
-  patch -p1 -i ../spyder3_to_spyder.patch
-  mv scripts/spyder{3,}.desktop
-  mv scripts/spyder{3,}.appdata.xml
   # Allow our jedi/parso/pyls versions
-  sed -i "s|JEDI_REQVER = '=0.17.1'|JEDI_REQVER = '>=0.17.1'|" -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
+  sed -i "s|JEDI_REQVER = '=|JEDI_REQVER = '>=|" -i spyder/dependencies.py
+  sed -i "s|PARSO_REQVER = '=|PARSO_REQVER = '>=|" -i spyder/dependencies.py
+  sed -i "s|PYLS_REQVER = '>=0.36.2;<1.0.0'|PYLS_REQVER = '>=0.36.2'|" -i spyder/dependencies.py
 }
 
 build() {
@@ -94,14 +94,14 @@
 check() {
   cd ${pkgname}-${pkgver}
   # Required per above patching
-  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
+  sed -i "s|jedi==|jedi>=|" -i setup.py
+  sed -i "s|parso==|parso>=|" -i setup.py
+  sed -i "s|python-language-server[all]>=0.36.2,<1.0.0|python-language-server[all]>=0.36.2|" -i setup.py
+  sed -i "s|jedi =|jedi >=|" -i requirements/conda.txt
+  sed -i "s|parso =|parso >=|" -i requirements/conda.txt
+  sed -i "s|jedi =|jedi >=|" -i binder/environment.yml
+  sed -i "s|parso =|parso >=|" -i binder/environment.yml
+  sed -i "s|python-language-server >=0.36.2,<1.0.0|python-language-server >=0.36.2|" -i binder/environment.yml
   # Some tests failures but upstream does not support us
   python runtests.py || echo "Tests failed"
 }

Deleted: spyder3_to_spyder.patch
===================================================================
--- spyder3_to_spyder.patch	2020-12-24 14:37:40 UTC (rev 788171)
+++ spyder3_to_spyder.patch	2020-12-24 14:38:59 UTC (rev 788172)
@@ -1,43 +0,0 @@
---- a/scripts/spyder3.desktop
-+++ b/scripts/spyder3.desktop
-@@ -1,12 +1,11 @@
- [Desktop Entry]
- Type=Application
- Version=1.0
--Name=Spyder3
--GenericName=Spyder3
-+Name=Spyder
- Comment=The Scientific Python Development Environment - Python 3
--Icon=spyder3
--TryExec=spyder3
--Exec=spyder3 %F
-+Icon=spyder
-+TryExec=spyder
-+Exec=spyder %F
- Terminal=false
- MimeType=text/x-python;
- Categories=Development;Science;IDE;Qt;
---- a/setup.py
-+++ b/setup.py
-@@ -88,9 +88,9 @@
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
-         if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
-+            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+                          ('share/icons', ['img_src/spyder.png']),
-+                          ('share/metainfo', ['scripts/spyder.appdata.xml'])]
-         else:
-             data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-@@ -131,7 +131,7 @@
- # See spyder-ide/spyder#1158.
- SCRIPTS = ['%s_win_post_install.py' % NAME]
- if PY3 and sys.platform.startswith('linux'):
--    SCRIPTS.append('spyder3')
-+    SCRIPTS.append('spyder')
- else:
-     SCRIPTS.append('spyder')
-