Update to version 1.0.5

3 files changed, 42 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83219e4c94d1..92825d498191 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,27 @@
 pkgbase = python-stsci.skypac
 	pkgdesc = Sky matching for image mosaic
-	pkgver = 1.0.4
+	pkgver = 1.0.5
 	pkgrel = 1
 	url = https://stsci-skypac.readthedocs.io/
 	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = python-setuptools
-	makedepends = python-relic
-	makedepends = python-spherical_geometry
-	makedepends = python-stsci.tools
-	makedepends = python-stwcs
-	makedepends = python-stsci.imagestats
-	makedepends = python-numpydoc
-	makedepends = python-sphinx_rtd_theme
-	makedepends = python-stsci_rtd_theme
-	source = https://github.com/spacetelescope/stsci.skypac/archive/1.0.4.tar.gz
-	md5sums = ef209b3328e4009d59fbcd766e2ef540
+	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
 
 pkgname = python-stsci.skypac
 	depends = python>=3.5
 	depends = python-astropy>=3.1
-	depends = python-spherical_geometry
+	depends = python-spherical_geometry>=1.2.2
 	depends = python-stwcs
 	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/.gitignore b/.gitignore
index 1df7b618a7b3..e896dcd6056d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ pkg
 *.tar.gz
 *.tar.bz2
 *.part
-*.pkg.tar.xz
+*.pkg.tar.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 5b7b9fcd0bae..ce8e4dc3684c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,45 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-stsci.skypac
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=1.0.4
+pkgname=("python-${_pyname}")
+# "python-${_pyname}-doc")
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="Sky matching for image mosaic"
 arch=('i686' 'x86_64')
 url="https://stsci-skypac.readthedocs.io/"
 license=('BSD')
-makedepends=('python-setuptools' 'python-relic' 'python-spherical_geometry' 'python-stsci.tools' 'python-stwcs' 'python-stsci.imagestats' 'python-numpydoc' 'python-sphinx_rtd_theme' 'python-stsci_rtd_theme')
-#checkdepends=('python-pytest')
+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')
 source=("https://github.com/spacetelescope/stsci.skypac/archive/${pkgver}.tar.gz")
-md5sums=('ef209b3328e4009d59fbcd766e2ef540')
-_pyver=$(python -V | cut -c 8-10)
+md5sums=('5fe3fc818628f706d83b51f6ddfd9cd2')
+
+prepare() {
+    export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+    export _pyver=$(python -V | cut -c 8-10)
+}
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
     python setup.py build
 
-    msg "Building Docs"
-    python setup.py build_sphinx
+#   msg "Building Docs"
+#   cd ${srcdir}/${_pyname}-${pkgver}/docs
+#   #PYTHONPATH="./build/lib" python setup.py build_sphinx
+#   PYTHONPATH="../build/lib" make html
 }
 
 #check() {
 #    cd ${srcdir}/${_pyname}-${pkgver}
 #
 #    python setup.py test
+##   pytest
 #}
 
-package_python-stsci.skypac() {
-    depends=('python>=3.5' 'python-astropy>=3.1' 'python-spherical_geometry' 'python-stwcs' 'python-stsci.imagestats')
+package() {
+    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}
 
@@ -40,10 +50,11 @@ package_python-stsci.skypac() {
     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 -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}"
+#}