Remove py2

4 files changed, 27 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 814bceecec29..c53f551adaaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,26 @@
-# Generated by mksrcinfo v8
-# Sat Mar 16 05:19:33 UTC 2019
 pkgbase = python-pydl
 	pkgdesc = Python replacements for functions that are part of the IDL built-in library or part of astronomical IDL libraries
 	pkgver = 0.7.0
 	pkgrel = 2
 	url = http://pydl.readthedocs.io/
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = BSD
 	checkdepends = python-pytest-astropy
-	checkdepends = python2-pytest32
-	checkdepends = python2-matplotlib
-	checkdepends = python2-astropy
 	makedepends = python-setuptools
 	makedepends = python-setuptools
+	makedepends = python-scipy
 	makedepends = python-astropy
 	makedepends = python-astropy-helpers
-	makedepends = python2-astropy-helpers
 	makedepends = python-sphinx-astropy
-	source = https://files.pythonhosted.org/packages/73/87/397a0d22112f48b794b39613ee3bddd315e64a38b33f24898962c4def5e4/pydl-0.7.0.tar.gz
-	source = python2-pydl.install
+	source = https://files.pythonhosted.org/packages/source/p/pydl/pydl-0.7.0.tar.gz
 	md5sums = 0bf0921aef8f5acbf192ac5c49f0d46c
-	md5sums = 49781cc7f77b9620ebd1252f17c0aa9e
 
 pkgname = python-pydl
-	depends = python
+	depends = python-scipy
 	depends = python-astropy
 	depends = python-matplotlib
 	optdepends = python-pytest-astropy: For testing
 	optdepends = python-pydl-doc: Documentation for PyDL
 
-pkgname = python2-pydl
-	install = python2-pydl.install
-	depends = python2
-	depends = python2-astropy
-	depends = python2-matplotlib
-	optdepends = python2-pytest32: For testing
-	optdepends = python-pydl-doc: Documentation for PyDL
-
 pkgname = python-pydl-doc
 	pkgdesc = Documentation for PyDL
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..06a3cebf3615
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+src
+pkg
+*.src.tar.gz
+*.tar.gz
+*.tar.bz2
+*.part
+*.pkg.tar*
+*.log
+LICENSE*
diff --git a/PKGBUILD b/PKGBUILD
index e78cd402302a..f1a08c744d2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,26 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-pydl
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
+pkgname=("python-${_pyname}" "python-${_pyname}-doc")
 pkgver=0.7.0
 pkgrel=2
 pkgdesc="Python replacements for functions that are part of the IDL built-in library or part of astronomical IDL libraries"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://pydl.readthedocs.io/"
 license=('BSD')
-makedepends=('python-setuptools' 'python-setuptools' 'python-astropy' 'python-astropy-helpers' 'python2-astropy-helpers' 'python-sphinx-astropy')
-checkdepends=('python-pytest-astropy' 'python2-pytest32' 'python2-matplotlib' 'python2-astropy')
-#source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
-source=("https://files.pythonhosted.org/packages/73/87/397a0d22112f48b794b39613ee3bddd315e64a38b33f24898962c4def5e4/pydl-0.7.0.tar.gz"
-        "python2-${_pyname}.install")
-md5sums=('0bf0921aef8f5acbf192ac5c49f0d46c'
-         '49781cc7f77b9620ebd1252f17c0aa9e')
+makedepends=('python-setuptools' 'python-setuptools' 'python-scipy' 'python-astropy' 'python-astropy-helpers' 'python-sphinx-astropy')
+checkdepends=('python-pytest-astropy')
+source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+#source=("https://files.pythonhosted.org/packages/73/87/397a0d22112f48b794b39613ee3bddd315e64a38b33f24898962c4def5e4/pydl-0.7.0.tar.gz")
+md5sums=('0bf0921aef8f5acbf192ac5c49f0d46c')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    sed -i -e '/auto_use/s/True/False/' setup.cfg
 
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+    sed -i -e '/auto_use/s/True/False/' setup.cfg
 }
 
 build() {
-    msg "Building Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py build --use-system-libraries --offline
-
-    msg "Building Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
     python setup.py build --use-system-libraries --offline
 
@@ -37,42 +29,19 @@ build() {
 }
 
 check() {
-    msg "Checking Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py test
 
-    if [ -z $(pacman -Qsq python2-pytest-cov) ]; then
-        msg "Checking Python2"
-        cd ${srcdir}/${_pyname}-${pkgver}-py2
-        python2 setup.py test
-    fi
-}
-
-package_python2-pydl() {
-    depends=('python2' 'python2-astropy' 'python2-matplotlib')
-    optdepends=('python2-pytest32: For testing'
-                'python-pydl-doc: Documentation for PyDL')
-    install=python2-${_pyname}.install
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-
-    install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}/"
-    install -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}/" licenses/*
-    install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
-    mv ${pkgdir}/usr/bin/compute_templates{,2}
-    mv ${pkgdir}/usr/bin/get_juldate{,2}
-    mv ${pkgdir}/usr/bin/hogg_iau_name{,2}
+    python setup.py test
 }
 
 package_python-pydl() {
-    depends=('python' 'python-astropy' 'python-matplotlib')
+    depends=('python-scipy' 'python-astropy' 'python-matplotlib')
     optdepends=('python-pytest-astropy: For testing'
                 'python-pydl-doc: Documentation for PyDL')
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}/"
-    install -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}/" licenses/*
-    install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
+    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" licenses/*
+    install -Dm644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
     python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
 }
 
@@ -80,6 +49,7 @@ package_python-pydl-doc() {
     pkgdesc="Documentation for PyDL"
     cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
-    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
+    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../licenses/*
+    install -dm755 "${pkgdir}/usr/share/doc/${pkgbase}"
     cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
 }
diff --git a/python2-pydl.install b/python2-pydl.install
deleted file mode 100644
index 22bee3e3b28d..000000000000
--- a/python2-pydl.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-    echo "
-    ==> If you want to run the testing for python2 version of PyDL, you need to remove the python2-pytest-cov package first.
-    "
-}