Update to version 1.0.7

2 files changed, 39 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92825d498191..19ccc29e8a48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
 pkgbase = python-stsci.skypac
 	pkgdesc = Sky matching for image mosaic
-	pkgver = 1.0.5
+	pkgver = 1.0.7
 	pkgrel = 1
-	url = https://stsci-skypac.readthedocs.io/
+	url = https://stsci-skypac.readthedocs.io
 	arch = i686
 	arch = x86_64
 	license = BSD
 	checkdepends = python-pytest-doctestplus
-	checkdepends = python-pytest-cov
-	checkdepends = python-codecov
-	checkdepends = python-spherical_geometry
-	checkdepends = python-stwcs
-	checkdepends = python-stsci.imagestats
 	makedepends = python-setuptools-scm
 	makedepends = python-pytest-runner
-	source = https://github.com/spacetelescope/stsci.skypac/archive/1.0.5.tar.gz
-	md5sums = 5fe3fc818628f706d83b51f6ddfd9cd2
+	makedepends = python-stwcs
+	makedepends = python-stsci.imagestats
+	makedepends = python-spherical_geometry>=1.2.2
+	makedepends = python-stsci_rtd_theme
+	makedepends = python-sphinx_rtd_theme
+	makedepends = python-numpydoc
+	makedepends = texlive-latexextra
+	source = https://github.com/spacetelescope/stsci.skypac/archive/1.0.7.tar.gz
+	md5sums = ef0fa3f76ad6e647409b83033024bf60
 
 pkgname = python-stsci.skypac
 	depends = python>=3.5
@@ -25,3 +27,5 @@ pkgname = python-stsci.skypac
 	depends = python-stsci.imagestats
 	optdepends = python-stsci.skypac-doc: Documentation for STScI skypac
 
+pkgname = python-stsci.skypac-doc
+	pkgdesc = Documentation for STScI skypac
diff --git a/PKGBUILD b/PKGBUILD
index ce8e4dc3684c..5c4a683edb6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,41 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-stsci.skypac
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}")
-# "python-${_pyname}-doc")
-pkgver=1.0.5
+pkgname=("python-${_pyname}" "python-${_pyname}-doc")
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="Sky matching for image mosaic"
 arch=('i686' 'x86_64')
-url="https://stsci-skypac.readthedocs.io/"
+url="https://stsci-skypac.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools-scm' 'python-pytest-runner')
-#'python-stsci.tools' 'python-stsci_rtd_theme')
-#'python-spherical_geometry' 'python-stsci.tools' 'python-stsci.imagestats' 'python-numpydoc' 'python-sphinx_rtd_theme' 'python-stwcs' 'python-stsci.imagestats')
-checkdepends=('python-pytest-doctestplus' 'python-pytest-cov' 'python-codecov' 'python-spherical_geometry' 'python-stwcs' 'python-stsci.imagestats')
+makedepends=('python-setuptools-scm' 'python-pytest-runner' 'python-stwcs' 'python-stsci.imagestats' 'python-spherical_geometry>=1.2.2' 'python-stsci_rtd_theme' 'python-sphinx_rtd_theme' 'python-numpydoc' 'texlive-latexextra')
+checkdepends=('python-pytest-doctestplus')
 source=("https://github.com/spacetelescope/stsci.skypac/archive/${pkgver}.tar.gz")
-md5sums=('5fe3fc818628f706d83b51f6ddfd9cd2')
+md5sums=('ef0fa3f76ad6e647409b83033024bf60')
 
 prepare() {
+    cd ${srcdir}/${_pyname}-${pkgver}/docs/source
+
+    sed -i "/^release/c release = '${pkgver}'" conf.py
     export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
-    export _pyver=$(python -V | cut -c 8-10)
+    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
 }
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
     python setup.py build
 
-#   msg "Building Docs"
-#   cd ${srcdir}/${_pyname}-${pkgver}/docs
-#   #PYTHONPATH="./build/lib" python setup.py build_sphinx
-#   PYTHONPATH="../build/lib" make html
+    msg "Building Docs"
+    PYTHONPATH="./build/lib" python setup.py build_sphinx
 }
 
-#check() {
-#    cd ${srcdir}/${_pyname}-${pkgver}
-#
-#    python setup.py test
-##   pytest
-#}
+check() {
+    cd ${srcdir}/${_pyname}-${pkgver}
+
+    pytest || warning "Tests failed"
+}
 
-package() {
+package_python-stsci.skypac() {
     depends=('python>=3.5' 'python-astropy>=3.1' 'python-spherical_geometry>=1.2.2' 'python-stwcs' 'python-stsci.imagestats')
     optdepends=('python-stsci.skypac-doc: Documentation for STScI skypac')
     cd ${srcdir}/${_pyname}-${pkgver}
@@ -50,11 +47,11 @@ package() {
     rm "${pkgdir}/usr/lib/python${_pyver}/site-packages/stsci/__pycache__"/*
 }
 
-#package_python-stsci.skypac-doc() {
-#    pkgdesc="Documentation for STScI skypac"
-#    cd ${srcdir}/${_pyname}-${pkgver}/build/sphinx
-#
-#    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE.txt
-#    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
-#    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
-#}
+package_python-stsci.skypac-doc() {
+    pkgdesc="Documentation for STScI skypac"
+    cd ${srcdir}/${_pyname}-${pkgver}/build/sphinx
+
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE.txt
+    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
+    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
+}