Update to version 2.1.0

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41a6385d45ec..9b9a9cf90af1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,27 @@
 pkgbase = python-ccdproc
 	pkgdesc = Affiliated package for the AstroPy package for basic data reductions of CCD images
-	pkgver = 2.0.1
+	pkgver = 2.1.0
 	pkgrel = 1
-	url = http://ccdproc.readthedocs.io/
+	url = http://ccdproc.readthedocs.io
 	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = cython
-	makedepends = python-astropy-helpers
+	checkdepends = python-pytest-astropy
+	makedepends = python-setuptools
 	makedepends = python-scikit-image
 	makedepends = python-astroscrappy
 	makedepends = python-reproject
 	makedepends = python-sphinx-astropy
-	source = https://files.pythonhosted.org/packages/source/c/ccdproc/ccdproc-2.0.1.tar.gz
-	md5sums = 127b86a2f8d5dce1e06109477f2e70d2
+	makedepends = graphviz
+	source = https://files.pythonhosted.org/packages/source/c/ccdproc/ccdproc-2.1.0.tar.gz
+	md5sums = 9e4d56b57e0f1ca0062df54d653f9608
 
 pkgname = python-ccdproc
-	depends = python
-	depends = python-numpy
-	depends = python-scipy
-	depends = python-astropy>=1.0
+	depends = python>=3.6
+	depends = python-numpy>=1.16
+	depends = python-astropy>=2.0
 	depends = python-scikit-image
-	depends = python-astroscrappy
+	depends = python-astroscrappy>=1.0.5
 	depends = python-reproject>=0.5
 	optdepends = python-ccdproc-doc: Documentation for CCDPROC
 
diff --git a/PKGBUILD b/PKGBUILD
index a7d4927f27c5..9baafa626d98 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,53 +2,49 @@
 pkgbase=python-ccdproc
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=2.0.1
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Affiliated package for the AstroPy package for basic data reductions of CCD images"
 arch=('i686' 'x86_64')
-url="http://ccdproc.readthedocs.io/"
+url="http://ccdproc.readthedocs.io"
 license=('BSD')
-makedepends=('cython' 'python-astropy-helpers' 'python-scikit-image' 'python-astroscrappy' 'python-reproject' 'python-sphinx-astropy')
-#checkdepends=('python-pytest-astropy')
+makedepends=('python-setuptools' 'python-scikit-image' 'python-astroscrappy' 'python-reproject' 'python-sphinx-astropy' 'graphviz')
+checkdepends=('python-pytest-astropy')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('127b86a2f8d5dce1e06109477f2e70d2')
+md5sums=('9e4d56b57e0f1ca0062df54d653f9608')
 
-prepare() {
+build() {
     cd ${srcdir}/${_pyname}-${pkgver}
+    python setup.py build
 
-#   sed -i -e '/[pytest]/s/pytest/tool:pytest/' setup.cfg
-    sed -i -e '/auto_use/s/True/False/' setup.cfg
+    msg "Building Docs"
+    cd ${srcdir}/${_pyname}-${pkgver}/docs
+    PYTHONPATH="../build/lib" make html
 }
 
-build() {
+check() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build --use-system-libraries --offline
 
-    msg "Building Docs"
-    python setup.py build_docs
+    pytest
 }
 
-#check() {
-#    cd ${srcdir}/${_pyname}-${pkgver}
-#
-#    python setup.py test
-#}
-
 package_python-ccdproc() {
-    depends=('python' 'python-numpy' 'python-scipy' 'python-astropy>=1.0' 'python-scikit-image' 'python-astroscrappy' 'python-reproject>=0.5')
+    depends=('python>=3.6' 'python-numpy>=1.16' 'python-astropy>=2.0' 'python-scikit-image' 'python-astroscrappy>=1.0.5' 'python-reproject>=0.5')
     optdepends=('python-ccdproc-doc: Documentation for CCDPROC')
     cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 LICENSE.rst -t "${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
+    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 }
 
 package_python-ccdproc-doc() {
     pkgdesc="Documentation for Python CCDPROC module"
     cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../licenses/*
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE.rst
     install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
     cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
 }