Drop py2

3 files changed, 15 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa7d86096f8c..da3c4d426126 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,23 +3,13 @@ pkgbase = python-stsci.distutils
 	pkgver = 0.3.7
 	pkgrel = 1
 	url = http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = BSD
-	checkdepends = python2-pytest
-	checkdepends = python2-nose
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	makedepends = python-d2to1
-	makedepends = python2-d2to1
 	source = https://files.pythonhosted.org/packages/source/s/stsci.distutils/stsci.distutils-0.3.7.tar.gz
 	md5sums = 65c866c0444f6a8effe2d41688606a0c
 
 pkgname = python-stsci.distutils
 	depends = python
 	optdepends = python-stsci.distutils-doc: Documentation for STScI Distutils
-
-pkgname = python2-stsci.distutils
-	depends = python2>=2.7
-	optdepends = python-stsci.distutils-doc: Documentation for STScI Distutils
-
diff --git a/.gitignore b/.gitignore
index 1df7b618a7b3..e896dcd6056d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ pkg
 *.tar.gz
 *.tar.bz2
 *.part
-*.pkg.tar.xz
+*.pkg.tar.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index a4d74d2db15b..fb4e03c250d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,32 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-stsci.distutils
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}")
+pkgname=("python-${_pyname}")
 pkgver=0.3.7
 pkgrel=1
 pkgdesc="Distutils/packaging-related utilities used by some of STScI's packages"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python"
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-d2to1' 'python2-d2to1')
-checkdepends=('python2-pytest' 'python2-nose')
+makedepends=('python-setuptools' 'python-d2to1')
+#checkdepends=('python-pytest')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
 md5sums=('65c866c0444f6a8effe2d41688606a0c')
 
-prepare() {
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
-}
 
 build() {
-    msg "Building Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py build
-
-    msg "Building Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
-}
-
-check() {
-#   cd ${srcdir}/${_pyname}-${pkgver}
-#   msg "Checking Python3"
-#   python setup.py test
 
-#   msg "Checking Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py test
+    python setup.py build
 }
 
-package_python2-stsci.distutils() {
-    depends=('python2>=2.7')
-    optdepends=('python-stsci.distutils-doc: Documentation for STScI Distutils')
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-
-    install -D -m644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 README.txt -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-}
+#check() {
+#    cd ${srcdir}/${_pyname}-${pkgver}
+#
+##   python setup.py test
+##   pytest
+#
+#}
 
 package_python-stsci.distutils() {
     depends=('python')