Update to version 1.0.1

2 files changed, 16 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0172f5d20b1..bff2f5b4d2f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,21 @@
 pkgbase = python-pyspeckit
 	pkgdesc = Toolkit for fitting and manipulating spectroscopic data in python
-	pkgver = 0.1.24
+	pkgver = 1.0.1
 	pkgrel = 1
 	url = https://pyspeckit.readthedocs.io
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = MIT
 	license = BSD
 	checkdepends = python-pytest-astropy
+	checkdepends = tk
 	checkdepends = python-spectral-cube
 	checkdepends = python-scipy
 	makedepends = python-setuptools
 	makedepends = python-astropy
 	makedepends = python-astropy-helpers>=3.1
 	makedepends = python-sphinx-astropy
-	source = https://files.pythonhosted.org/packages/source/p/pyspeckit/pyspeckit-0.1.24.tar.gz
-	source = correct_doc_examples.patch
-	source = fix_for_new_matplotlib.patch
-	md5sums = 3c4c73493c412f3248e9667e69b151cf
-	md5sums = b1ea9f4f4d2c467c26c34293bfbd387f
-	md5sums = a9a13077c3a3b3d039266450d9318aae
+	source = https://files.pythonhosted.org/packages/source/p/pyspeckit/pyspeckit-1.0.1.tar.gz
+	md5sums = c99b5d87854f0739f7777758e1f414d0
 
 pkgname = python-pyspeckit
 	depends = python-astropy
diff --git a/PKGBUILD b/PKGBUILD
index 131ab8585f0a..e8dfe19c63a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,43 +2,33 @@
 pkgbase=python-pyspeckit
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-# "python2-${_pyname}"
-pkgver=0.1.24
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="Toolkit for fitting and manipulating spectroscopic data in python"
-arch=('i686' 'x86_64')
+arch=('any')
 url="https://pyspeckit.readthedocs.io"
 license=('MIT' 'BSD')
 makedepends=('python-setuptools'
-#            'python2-setuptools'
              'python-astropy'
              'python-astropy-helpers>=3.1'
-#            'python2-astropy-helpers'
              'python-sphinx-astropy')
-#checkdepends=('tk' 'python-pytest')
-checkdepends=('python-pytest-astropy' 'python-spectral-cube' 'python-scipy')
+checkdepends=('python-pytest-astropy' 'tk' 'python-spectral-cube' 'python-scipy')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
-        'correct_doc_examples.patch'
-        'fix_for_new_matplotlib.patch')
-md5sums=('3c4c73493c412f3248e9667e69b151cf'
-         'b1ea9f4f4d2c467c26c34293bfbd387f'
-         'a9a13077c3a3b3d039266450d9318aae')
+        )
+md5sums=('c99b5d87854f0739f7777758e1f414d0')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
     sed -i -e '/auto_use/s/True/False/' setup.cfg
-#   patch -Np1 -i "${srcdir}/correct_doc_examples.patch"
-#   cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
-#   patch -Np1 -i "${srcdir}/fix_for_new_matplotlib.patch"
+    ln -rs ${srcdir}/${_pyname}-${pkgver}/{${_pyname}/tests/*.fits,}
+    ln -rs ${srcdir}/${_pyname}-${pkgver}/{${_pyname}/tests/*.txt,}
+    ln -rs ${srcdir}/${_pyname}-${pkgver}/{${_pyname}/tests/wav2rgb.py,}
+    sed -i "/import\ idlsave/c from scipy.io import readsav as idlsave" ${_pyname}/spectrum/readers/alfalfa.py
+    rm -r astropy_helpers
 }
 
 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
 
@@ -49,32 +39,10 @@ build() {
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-#   python setup.py test
-    pytest "build/lib" || warning "Tests failed"
+    pytest || warning "Tests failed"
 
-#   msg "Checking Python2"
-#   cd ${srcdir}/${_pyname}-${pkgver}-py2
-#   python2 setup.py test
 }
 
-#package_python2-pyspeckit() {
-#    depends=('python2-numpy>=1.4' 'python2-astropy>=1.0' 'python2-matplotlib>=1.4')
-#    optdepends=('hdf5'
-#                'python2-atpy'
-#                'python2-spectral-cube'
-#                'python2-lmfit'
-#                'python-pyspeckit-doc: Documentation for PySpecKit'
-#                'python2-pytest: For testing')
-#    cd ${srcdir}/${_pyname}-${pkgver}-py2
-#
-#    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" licenses/*
-#    install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README*
-#    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
-#    sed -i -e '/\#\/bin/s/ipython/ipython2/' ${pkgdir}/usr/bin/pyspeckit_script.py
-#    mv ${pkgdir}/usr/bin/astropy-package-template-example{,2}
-#    mv ${pkgdir}/usr/bin/pyspeckit_script{,2}.py
-#}
-
 package_python-pyspeckit() {
     depends=('python-astropy' 'python-matplotlib>=1.4')
     optdepends=('hdf5'