Update to version 4.0.0

2 files changed, 15 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94c286b3aebf..ea53c1e8cd9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,20 @@
 pkgbase = python-stsci.tools
 	pkgdesc = Collection of STScI utility functions
-	pkgver = 3.6.0
-	pkgrel = 3
-	url = https://stscitools.readthedocs.io/
+	pkgver = 4.0.0
+	pkgrel = 1
+	url = https://stscitools.readthedocs.io
 	arch = i686
 	arch = x86_64
 	license = BSD
 	checkdepends = python-pytest-doctestplus
 	checkdepends = python-astropy
 	checkdepends = tk
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	makedepends = python-relic
-	makedepends = python2-relic
-	source = https://files.pythonhosted.org/packages/source/s/stsci.tools/stsci.tools-3.6.0.tar.gz
-	md5sums = 6c3db13921475d8a17c57c75263501a0
+	makedepends = python-setuptools-scm
+	source = https://files.pythonhosted.org/packages/source/s/stsci.tools/stsci.tools-4.0.0.tar.gz
+	md5sums = 75f693cc113cff00a59d7432cc44eaf2
 
 pkgname = python-stsci.tools
 	depends = python-astropy
 	optdepends = python-stsci.tools-doc: Documentation for STScI Tools
-	provides = python-stscitools=3.6.0
+	provides = python-stscitools=4.0.0
 	conflicts = python-stscitools
-
-pkgname = python2-stsci.tools
-	depends = python2-astropy
-	optdepends = python-stsci.tools-doc: Documentation for STScI Tools
-	provides = python2-stscitools=3.6.0
-	conflicts = python2-stscitools
-
diff --git a/PKGBUILD b/PKGBUILD
index c4ba30ff19b3..dfba580c0411 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,28 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-stsci.tools
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}")
-pkgver=3.6.0
-pkgrel=3
+pkgname=("python-${_pyname}")
+pkgver=4.0.0
+pkgrel=1
 pkgdesc="Collection of STScI utility functions"
 arch=('i686' 'x86_64')
-url="https://stscitools.readthedocs.io/"
+url="https://stscitools.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-relic' 'python2-relic')
+makedepends=('python-setuptools-scm')
 checkdepends=('python-pytest-doctestplus' 'python-astropy' 'tk')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('6c3db13921475d8a17c57c75263501a0')
-
-prepare() {
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
-}
+md5sums=('75f693cc113cff00a59d7432cc44eaf2')
 
 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() {
-#   msg "Checking Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py test
-
-#   msg "Checking Python2"
-#   cd ${srcdir}/${_pyname}-${pkgver}-py2
-#   python2 setup.py test
-}
 
-package_python2-stsci.tools() {
-    depends=('python2-astropy')
-    optdepends=('python-stsci.tools-doc: Documentation for STScI Tools')
-    provides=("python2-stscitools=${pkgver}")
-    conflicts=('python2-stscitools')
-    cd ${srcdir}/${_pyname}-${pkgver}
-
-    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE.md
-    install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-    mv ${pkgdir}/usr/bin/convertlog{,2}
-    mv ${pkgdir}/usr/bin/convertwaiveredfits{,2}
+    pytest
 }
 
 package_python-stsci.tools() {