Remove 'spyder' (python 2 version) from split package

1 files changed, 56 insertions, 120 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e5280cd0066f..3cac4450c61c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,147 +1,83 @@
 # Maintainer: willemw <willemw12@gmail.com>
 
-_pkgname2=spyder
-_pkgname3=spyder3
-pkgbase=$_pkgname2-git
-pkgname=($_pkgname2-git $_pkgname3-git)
+_pkgname=spyder3
+pkgname=$_pkgname-git
 pkgver=4.0.0rc1.r120.gdbc198597
 pkgrel=1
+pkgdesc="The Scientific Python Development Environment (Python 3 version)"
 arch=('any')
 url="https://www.spyder-ide.org/"
 license=('MIT')
-makedepends=('python2-sphinx' 'python2-setuptools' 
-             'python-sphinx' 'python-setuptools'
-             'git')
-source=($_pkgname2::git+https://github.com/spyder-ide/spyder.git)
+makedepends=('git' 'python-setuptools' 'python-sphinx')
+#'icu'
+depends=('jupyter-nbconvert'
+         'python-atomicwrites'
+         'python-chardet'
+         'python-cloudpickle'
+         'python-diff-match-patch'
+         'python-jedi'
+         'python-keyring'
+         'python-language-server'
+         'python-numpydoc'
+         'python-paramiko'
+         'python-pexpect'
+         'python-pickleshare'
+         'python-psutil'
+         'python-pycodestyle'
+         'python-pyflakes'
+         'python-pygments'
+         'python-pylint'
+         'python-pympler'
+         'python-pyqt5'
+         'python-pyzmq'
+         'python-qdarkstyle'
+         'python-qtawesome'
+         'python-qtconsole'
+         'python-rope'
+         'python-sphinx'
+         'python-spyder-kernels'
+         'python-watchdog'
+         'python-xdg'
+
+         'desktop-file-utils'
+         'gtk-update-icon-cache')
+#'pyside2: Qt-Python bindings'
+optdepends=('cython: run Cython files'
+            'python-matplotlib: 2D/3D plotting'
+            'python-numpy: N-dimensional arrays'
+            'python-pandas: DataFrame and Series support'
+            'python-scipy: signal/image processing'
+            'python-sympy: symbolic mathematics'
+
+            'python-h5py: HDF5 support')
+provides=($_pkgname)
+conflicts=($_pkgname)
+source=($pkgname::git+https://github.com/spyder-ide/spyder.git)
 md5sums=('SKIP')
 
 pkgver() {
-  cd $_pkgname2
+  cd $pkgname
   git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 } 
 
 prepare() {
-  find $_pkgname2 -type f -iname \*.py -exec sed -i -e 's|"pep8"|"pycodestyle"|g' -e "s|'pep8'|'pycodestyle'|g" '{}' \;
-
-  rm -rf $_pkgname3
-  cp -a $_pkgname2 $_pkgname3
+  find $pkgname -type f -iname \*.py -exec sed -i -e 's|"pep8"|"pycodestyle"|g' -e "s|'pep8'|'pycodestyle'|g" '{}' \;
 }
 
 build() {
-  cd "$srcdir/$_pkgname2"
-  python2 setup.py build
-
-  cd "$srcdir/$_pkgname3"
+  cd $pkgname
   python setup.py build
 }
 
-package_spyder-git() {
-  pkgdesc="The Scientific Python Development Environment (Python 2 version)"
-  # Note: 'ipython2-notebook' nor 'jupyter'/'jupyter-nbconvert' contain a Python 2 version of Nbconvert
-  #'icu'
-  #TODO 'python2-qdarkstyle'
-  #TODO 'python2-diff-match-patch'
-  depends=('python2-atomicwrites'
-           'python2-chardet'
-           'python2-cloudpickle'
-           'python2-jedi'
-           'python2-keyring'
-           'python2-language-server'
-           'python2-numpydoc'
-           'python2-paramiko'
-           'python2-pexpect'
-           'python2-pickleshare'
-           'python2-psutil'
-           'python2-pycodestyle'
-           'python2-pyflakes'
-           'python2-pygments'
-           'python2-pylint'
-           'python2-pympler'
-           'python2-pyqt5'
-           'python2-pyzmq'
-           'python2-qtawesome'
-           'python2-qtconsole'
-           'python2-rope'
-           'python2-sphinx'
-           'python2-spyder-kernels'
-           'python2-watchdog'
-           'python2-xdg'
-
-           'python2-pathlib2'
-
-           'desktop-file-utils'
-           'gtk-update-icon-cache')
-  #'python2-pyside2: Qt-Python bindings'
-  optdepends=('cython2: run Cython files'
-              'python2-matplotlib: 2D/3D plotting'
-              'python2-numpy: N-dimensional arrays'
-              'python2-pandas: DataFrame and Series support'
-              'python2-scipy: signal/image processing'
-              'python2-sympy: symbolic mathematics'
+package() {
+  cd $pkgname
 
-              'python2-h5py: HDF5 support')
-  provides=($_pkgname2)
-  conflicts=($_pkgname2)
-
-  cd $_pkgname2
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-  # Install a scalable icon for the spyder.desktop file
-  install -Dm644 spyder/images/spyder.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/spyder.svg"
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$_pkgname2/LICENSE.txt"
-  rm -f "$pkgdir/usr/bin/spyder_win_post_install.py"
-}
-
-package_spyder3-git() {
-  pkgdesc="The Scientific Python Development Environment (Python 3 version)"
-  #'icu'
-  depends=('jupyter-nbconvert'
-           'python-atomicwrites'
-           'python-chardet'
-           'python-cloudpickle'
-           'python-diff-match-patch'
-           'python-jedi'
-           'python-keyring'
-           'python-language-server'
-           'python-numpydoc'
-           'python-paramiko'
-           'python-pexpect'
-           'python-pickleshare'
-           'python-psutil'
-           'python-pycodestyle'
-           'python-pyflakes'
-           'python-pygments'
-           'python-pylint'
-           'python-pympler'
-           'python-pyqt5'
-           'python-pyzmq'
-           'python-qdarkstyle'
-           'python-qtawesome'
-           'python-qtconsole'
-           'python-rope'
-           'python-sphinx'
-           'python-spyder-kernels'
-           'python-watchdog'
-           'python-xdg'
-
-           'desktop-file-utils'
-           'gtk-update-icon-cache')
-  #'pyside2: Qt-Python bindings'
-  optdepends=('cython: run Cython files'
-              'python-matplotlib: 2D/3D plotting'
-              'python-numpy: N-dimensional arrays'
-              'python-pandas: DataFrame and Series support'
-              'python-scipy: signal/image processing'
-              'python-sympy: symbolic mathematics'
-
-              'python-h5py: HDF5 support')
-  provides=($_pkgname3)
-  conflicts=($_pkgname3)
-
-  cd $_pkgname3
   python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$_pkgname/LICENSE.txt"
   # Install a scalable icon for the spyder3.desktop file
   install -Dm644 spyder/images/spyder.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/spyder3.svg"
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$_pkgname3/LICENSE.txt"
+
   rm -f "$pkgdir/usr/bin/spyder_win_post_install.py"
 }