Update to version 1.1.0

3 files changed, 41 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39c411aae04f..682c184e2422 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = python-astroscrappy
 	pkgdesc = Speedy Cosmic Ray Annihilation Package in Python
-	pkgver = 1.0.8
+	pkgver = 1.1.0
 	pkgrel = 1
-	url = https://github.com/astropy/astroscrappy
+	url = https://astroscrappy.readthedocs.io
 	arch = i686
 	arch = x86_64
 	license = BSD
-	checkdepends = python-pytest-astropy
-	makedepends = cython>=0.21
+	checkdepends = python-pytest-doctestplus
+	checkdepends = python-scipy
+	makedepends = python-setuptools-scm
+	makedepends = cython
 	makedepends = python-astropy
-	makedepends = python-astropy-helpers31
+	makedepends = python-extension-helpers
 	makedepends = python-sphinx-astropy
-	source = https://files.pythonhosted.org/packages/source/a/astroscrappy/astroscrappy-1.0.8.tar.gz
-	md5sums = eb68a7c81ea8d4370eab66e9c7859576
+	source = https://files.pythonhosted.org/packages/source/a/astroscrappy/astroscrappy-1.1.0.tar.gz
+	md5sums = 43e189d666fab2ecf476f2a569f37760
 
 pkgname = python-astroscrappy
 	depends = python
-	depends = python-numpy
 	depends = python-astropy
 	depends = cython>=0.21
 	optdepends = python-astroscrappy-doc: Documentation for Astro-SCRAPPY
-
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 f6e7825a458b..7e99094faed4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,52 +3,51 @@ pkgbase=python-astroscrappy
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}")
 #"python-${_pyname}-doc")
-pkgver=1.0.8
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Speedy Cosmic Ray Annihilation Package in Python"
 arch=('i686' 'x86_64')
-url="https://github.com/astropy/astroscrappy"
+url="https://astroscrappy.readthedocs.io"
 license=('BSD')
-makedepends=('cython>=0.21' 'python-astropy' 'python-astropy-helpers31' 'python-sphinx-astropy')
-checkdepends=('python-pytest-astropy')
+makedepends=('python-setuptools-scm' 'cython' 'python-astropy' 'python-extension-helpers' 'python-sphinx-astropy')
+checkdepends=('python-pytest-doctestplus' 'python-scipy')
 source=("https://files.pythonhosted.org/packages/source/a/astroscrappy/astroscrappy-${pkgver}.tar.gz")
-md5sums=('eb68a7c81ea8d4370eab66e9c7859576')
+md5sums=('43e189d666fab2ecf476f2a569f37760')
 
 prepare() {
-    cd ${srcdir}/${_pyname}-${pkgver}
-
-    sed -i -e '/auto_use/s/True/False/' setup.cfg
+    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
 }
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build --use-system-libraries --offline
+    python setup.py build
 
-#   msg "Building Docs"
-#   python setup.py build_docs
+    msg "Building Docs"
+    cd ${srcdir}/${_pyname}-${pkgver}/docs
+    PYTHONPATH="../build/lib.linux-${CARCH}-${_pyver}" make html
 }
 
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    python setup.py test
+    PYTHONPATH="build/lib.linux-${CARCH}-${_pyver}" pytest "build/lib.linux-${CARCH}-${_pyver}" || warning "Tests failed"
 }
 
 package_python-astroscrappy() {
-    depends=('python' 'python-numpy' 'python-astropy' 'cython>=0.21')
+    depends=('python' 'python-astropy' 'cython>=0.21')
     optdepends=('python-astroscrappy-doc: Documentation for Astro-SCRAPPY')
     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}"
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+    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
 }
 
-#package_python-astroscrappy-doc() {
-#    pkgdesc="Documentation for Astro-SCRAPPY"
-#    cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
-#
-#    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
-#    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
-#}
+package_python-astroscrappy-doc() {
+    pkgdesc="Documentation for Astro-SCRAPPY"
+    cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
+
+    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../licenses/*
+    install -dm755 "${pkgdir}/usr/share/doc/${pkgbase}"
+    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
+}