[arch-commits] Commit in spyder/repos/community-any (5 files)

Bruno Pagani archange at archlinux.org
Mon May 11 19:25:27 UTC 2020


    Date: Monday, May 11, 2020 @ 19:25:26
  Author: archange
Revision: 626362

archrelease: copy trunk to community-any

Added:
  spyder/repos/community-any/PKGBUILD
    (from rev 626361, spyder/trunk/PKGBUILD)
  spyder/repos/community-any/spyder3_to_spyder.patch
    (from rev 626361, spyder/trunk/spyder3_to_spyder.patch)
Deleted:
  spyder/repos/community-any/PKGBUILD
  spyder/repos/community-any/bug_54508_missing_pyqt4_qtwebkit.patch
  spyder/repos/community-any/spyder3_to_spyder.patch

----------------------------------------+
 PKGBUILD                               |  156 +++++++++++++++++++------------
 bug_54508_missing_pyqt4_qtwebkit.patch |   24 ----
 spyder3_to_spyder.patch                |   88 ++++++++---------
 3 files changed, 139 insertions(+), 129 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-11 19:25:17 UTC (rev 626361)
+++ PKGBUILD	2020-05-11 19:25:26 UTC (rev 626362)
@@ -1,60 +0,0 @@
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Francois Boulogne <fboulogne at april.org>
-# Contributor: TDY <tdy at gmx.com>
-
-pkgname=spyder
-pkgver=3.3.6
-pkgrel=2
-pkgdesc='The Scientific Python Development Environment (Python 3 version)'
-arch=('any')
-url='https://www.spyder-ide.org/'
-license=('MIT')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgname}/archive/v${pkgver}.tar.gz"
-        "bug_54508_missing_pyqt4_qtwebkit.patch"
-        "spyder3_to_spyder.patch")
-sha256sums=('aa3e46e30da987a2532854d3ba30143f7876bddb3be1b0d5ced11a7ab7abea83'
-            '28d4aa8938d809c299ab6bf6b00a2f82677f9a98a9763b7127970881b76276f5'
-            'bca64095b2409676c4dd3dddc9e19190f36cfd30494966af1eba3de876c1f2aa')
-makedepends=('python-setuptools' 'python-sphinx')
-depends=('python-pyqt5' 'qt5-webkit' 'python-qtconsole' 'python-qtpy' 'python-qtawesome'
-         'python-pyflakes' 'python-pyzmq' 'python-pygments' 'python-psutil' 'python-pickleshare'
-         'jupyter' 'jupyter-nbconvert'
-         'python-rope' 'python-jedi' 'python-pylint' 'python-pycodestyle' 'python-sphinx'
-         'python-opengl' 'python-spyder-kernels<1.0' 'icu' 'gtk-update-icon-cache'
-         'desktop-file-utils')
-optdepends=('python-numpy: N-dimensional arrays'
-            'python-scipy: signal/image processing'
-            'python-h5py: HDF5 support'
-            'python-matplotlib: interactive 2D/3D data plotting'
-            'python-sympy: symbolic mathematics for the IPython console'
-            'python-pandas: view and edit DataFrames and Series in the Variable Explorer')
-conflicts=('spyder3')
-replaces=('spyder3')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  # Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
-  echo "Applying patches bug_54508_missing_pyqt4_qtwebkit.patch"
-  patch -p1 -i "../bug_54508_missing_pyqt4_qtwebkit.patch"
-  # Replace spyder3 with spyder
-  rm "scripts/spyder.desktop"
-  patch -p1 -i "../spyder3_to_spyder.patch"
-  mv "scripts/spyder3.desktop" "scripts/spyder.desktop"
-  mv "scripts/spyder3.appdata.xml" "scripts/spyder.appdata.xml"
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  python3 setup.py build
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-  python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-  # Install license file
-  install -D -m644 "LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-  # Install icon and desktop file
-  install -D -m644 "spyder/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
-  # Remove useless spyder_win_post_install script
-  rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py"
-}

Copied: spyder/repos/community-any/PKGBUILD (from rev 626361, spyder/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-11 19:25:26 UTC (rev 626362)
@@ -0,0 +1,96 @@
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Francois Boulogne <fboulogne at april.org>
+# Contributor: TDY <tdy at gmx.com>
+
+pkgname=spyder
+pkgver=3.3.6
+pkgrel=3
+pkgdesc="The Scientific Python Development Environment"
+arch=(any)
+url="https://www.spyder-ide.org/"
+license=(MIT)
+makedepends=(python-setuptools)
+depends=(
+    python-cloudpickle
+    python-rope
+    python-jedi
+    python-pyflakes
+    python-pygments
+    python-qtconsole
+    jupyter-nbconvert
+    python-sphinx
+    python-pycodestyle
+    python-pylint
+    python-psutil
+    python-qtawesome
+    python-qtpy
+    python-pickleshare
+    python-pyzmq
+    python-chardet
+    python-numpydoc
+    python-spyder-kernels
+    python-keyring
+    python-pyqt5
+    python-pyqtwebengine
+    qt5-webkit
+)
+optdepends=(
+    'cython: run Cython files in the IPython Console'
+    'python-matplotlib: 2D/3D plotting in the IPython Console'
+    'python-numpy: support for N-dimensional arrays in the Variable Explorer'
+    'python-pandas: support for DataFrames and Series in the Variable Explorer'
+    'python-scipy: support for Matlab workspace in the Variable Explorer'
+    'python-sympy: symbolic mathematics in the IPython Console'
+)
+checkdepends=(
+    python-pytest
+    python-pytest-qt
+    python-pytest-mock
+    python-pytest-cov
+    python-pytest-xvfb
+    python-mock
+    python-flaky
+    python-pandas
+    python-scipy
+    python-sympy
+    python-pillow
+    python-matplotlib
+    cython
+)
+source=(https://github.com/spyder-ide/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+        spyder3_to_spyder.patch)
+sha256sums=('aa3e46e30da987a2532854d3ba30143f7876bddb3be1b0d5ced11a7ab7abea83'
+            '42b51d2696f06e4ad69be7379e913fd90e5c09c3e8244b6f38ef127ae86cfe89')
+
+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 version
+  sed -i "s|JEDI_REQVER = '=0.14.1'|JEDI_REQVER = '>=0.14.1'|" -i spyder/dependencies.py
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  python setup.py build
+}
+
+# Tests are segfaulting the build
+#check() {
+#  cd ${pkgname}-${pkgver}
+#  pytest
+#}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  # Install license file
+  install -Dm644 LICENSE.txt -t ${pkgdir}/usr/share/licenses/${pkgname}/
+  # Install icon file
+  install -Dm644 spyder/images/spyder.svg -t "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/
+  # Remove useless spyder_win_post_install script
+  rm -f "${pkgdir}"/usr/bin/spyder_win_post_install.py
+}

Deleted: bug_54508_missing_pyqt4_qtwebkit.patch
===================================================================
--- bug_54508_missing_pyqt4_qtwebkit.patch	2020-05-11 19:25:17 UTC (rev 626361)
+++ bug_54508_missing_pyqt4_qtwebkit.patch	2020-05-11 19:25:26 UTC (rev 626362)
@@ -1,24 +0,0 @@
-diff -Naur spyder-3.1.4.orig/scripts/spyder spyder-3.1.4/scripts/spyder
---- spyder-3.1.4.orig/scripts/spyder	2017-04-24 02:30:23.000000000 +0200
-+++ spyder-3.1.4/scripts/spyder	2017-07-09 18:47:22.072698407 +0200
-@@ -1,3 +1,8 @@
- #!/usr/bin/env python
-+
-+# Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
-+import os
-+os.environ['QT_API'] = 'pyqt5'
-+
- from spyder.app import start
- start.main()
-diff -Naur spyder-3.1.4.orig/scripts/spyder3 spyder-3.1.4/scripts/spyder3
---- spyder-3.1.4.orig/scripts/spyder3	2017-04-24 02:30:23.000000000 +0200
-+++ spyder-3.1.4/scripts/spyder3	2017-07-09 18:47:27.659425267 +0200
-@@ -1,3 +1,8 @@
- #! /usr/bin/python3
-+
-+# Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
-+import os
-+os.environ['QT_API'] = 'pyqt5'
-+
- from spyder.app import start
- start.main()

Deleted: spyder3_to_spyder.patch
===================================================================
--- spyder3_to_spyder.patch	2020-05-11 19:25:17 UTC (rev 626361)
+++ spyder3_to_spyder.patch	2020-05-11 19:25:26 UTC (rev 626362)
@@ -1,45 +0,0 @@
-diff -Naur spyder-3.3.6.orig/scripts/spyder3.desktop spyder-3.3.6/scripts/spyder3.desktop
---- spyder-3.3.6.orig/scripts/spyder3.desktop	2019-07-14 12:49:39.000000000 +0200
-+++ spyder-3.3.6/scripts/spyder3.desktop	2019-10-12 19:32:47.496911043 +0200
-@@ -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;
-diff -Naur spyder-3.3.6.orig/setup.py spyder-3.3.6/setup.py
---- spyder-3.3.6.orig/setup.py	2019-07-14 12:49:39.000000000 +0200
-+++ spyder-3.3.6/setup.py	2019-10-12 19:40:23.339975060 +0200
-@@ -85,9 +85,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'])]
-@@ -134,7 +134,7 @@
- # platforms due to a bug in pip installation process (see Issue 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')
- 

Copied: spyder/repos/community-any/spyder3_to_spyder.patch (from rev 626361, spyder/trunk/spyder3_to_spyder.patch)
===================================================================
--- spyder3_to_spyder.patch	                        (rev 0)
+++ spyder3_to_spyder.patch	2020-05-11 19:25:26 UTC (rev 626362)
@@ -0,0 +1,43 @@
+--- 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')
+ 


More information about the arch-commits mailing list