Drop py2

2 files changed, 28 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef9ef46585de..4427c0a73c35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,13 +8,9 @@ pkgbase = python-stsci.convolve
 	license = BSD
 	checkdepends = python2-nose
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	makedepends = python-numpy
-	makedepends = python2-numpy
 	makedepends = python-d2to1
-	makedepends = python2-d2to1
 	makedepends = python-stsci.distutils
-	makedepends = python2-stsci.distutils
 	source = https://files.pythonhosted.org/packages/source/s/stsci.convolve/stsci.convolve-2.2.2.tar.gz
 	source = https://raw.githubusercontent.com/spacetelescope/stsci.convolve/master/LICENSE.txt
 	md5sums = fb0feba75f45d85f34d6e4599efcd3db
@@ -22,7 +18,3 @@ pkgbase = python-stsci.convolve
 
 pkgname = python-stsci.convolve
 	depends = python-numpy
-
-pkgname = python2-stsci.convolve
-	depends = python2-numpy
-
diff --git a/PKGBUILD b/PKGBUILD
index 7b56727b01e0..0e22eebe4ce6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-stsci.convolve
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}")
+pkgname=("python-${_pyname}")
+#"python2-${_pyname}")
 pkgver=2.2.2
 pkgrel=1
 pkgdesc="Image array convolution functions"
 arch=('i686' 'x86_64')
 url="http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python"
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-numpy' 'python2-numpy' 'python-d2to1' 'python2-d2to1' 'python-stsci.distutils' 'python2-stsci.distutils')
+makedepends=('python-setuptools' 'python-numpy' 'python-d2to1' 'python-stsci.distutils')
 checkdepends=('python2-nose')
 #             'python-pytest')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
@@ -16,38 +17,38 @@ source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname
 md5sums=('fb0feba75f45d85f34d6e4599efcd3db'
          '901964fd100b953a8c8fd4d8f0ae8a7e')
 
-prepare() {
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
-}
+#prepare() {
+#    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+#}
 
 build() {
-    msg "Building Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py build
+#   msg "Building Python2"
+#   cd ${srcdir}/${_pyname}-${pkgver}-py2
+#   python2 setup.py build
 
-    msg "Building Python3"
+#   msg "Building Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
     python setup.py build
 }
 
-check() {
-#   msg "Checking Python3"
-#   cd ${srcdir}/${_pyname}-${pkgver}
-#   python setup.py test
-#   pytest
-
-#   msg "Checking Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py test
-}
-
-package_python2-stsci.convolve() {
-    depends=('python2-numpy')
-    cd ${srcdir}/${_pyname}-${pkgver}
-
-    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${srcdir}/LICENSE.txt"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-}
+#check() {
+##   msg "Checking Python3"
+##   cd ${srcdir}/${_pyname}-${pkgver}
+##   python setup.py test
+##   pytest
+#
+##   msg "Checking Python2"
+##   cd ${srcdir}/${_pyname}-${pkgver}-py2
+##   python2 setup.py test
+#}
+
+#package_python2-stsci.convolve() {
+#    depends=('python2-numpy')
+#    cd ${srcdir}/${_pyname}-${pkgver}
+#
+#    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${srcdir}/LICENSE.txt"
+#    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+#}
 
 package_python-stsci.convolve() {
     depends=('python-numpy')