Update to version 4.10.1, add documents

2 files changed, 51 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b27d8948f27..d0031346697f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,26 @@
 # Generated by mksrcinfo v8
-# Fri May 25 08:27:11 UTC 2018
+# Sat Nov  3 16:49:05 UTC 2018
 pkgbase = python-sherpa
 	pkgdesc = Modeling and fitting package for scientific data analysis
-	pkgver = 4.10.0
+	pkgver = 4.10.1
 	pkgrel = 1
 	url = http://cxc.cfa.harvard.edu/contrib/sherpa/
-	install = python-sherpa.install
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = python>=3.5
+	makedepends = python-numpy
+	makedepends = fftw
 	makedepends = python-setuptools
 	makedepends = gcc-fortran
+	makedepends = python-sphinx>=1.3
+	source = https://files.pythonhosted.org/packages/source/s/sherpa/sherpa-4.10.1.tar.gz
+	source = sherpa_local_fftw.patch
+	md5sums = 28137b797633670373e6d729c8d02501
+	md5sums = d1823cc7683442d92450fadff7aed362
+
+pkgname = python-sherpa
+	install = python-sherpa.install
 	depends = python>=3.5
 	depends = python-numpy
 	depends = fftw
@@ -21,10 +31,8 @@ pkgbase = python-sherpa
 	optdepends = python-pytest>=3.3: For testing suite
 	optdepends = python-mock: For testing suite
 	optdepends = python-pytest-xvfb: For testing suite
-	source = https://files.pythonhosted.org/packages/source/s/sherpa/sherpa-4.10.0.tar.gz
-	source = sherpa_local_fftw.patch
-	md5sums = ac7f1d7e7ea835719a184a4dd3218743
-	md5sums = d1823cc7683442d92450fadff7aed362
+	optdepends = python-sherpa-doc: Documentation for Sherpa
 
-pkgname = python-sherpa
+pkgname = python-sherpa-doc
+	pkgdesc = Documentation for Sherpa
 
diff --git a/PKGBUILD b/PKGBUILD
index dd53abf6fce3..8cfab8dc9d2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,16 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
-pkgname=python-sherpa
-pkgver=4.10.0
+pkgbase=python-sherpa
+pkgname=('python-sherpa' 'python-sherpa-doc')
+pkgver=4.10.1
 pkgrel=1
 pkgdesc="Modeling and fitting package for scientific data analysis"
 arch=('i686' 'x86_64')
 url="http://cxc.cfa.harvard.edu/contrib/sherpa/"
 license=('GPL')
-depends=('python>=3.5' 'python-numpy' 'fftw')
-makedepends=('python-setuptools' 'gcc-fortran')
-optdepends=('python-matplotlib: Graphical output'
-            'python-astropy: Data I/O support'
-            'ds9-bin: Imaging requires'
-            'xpa: Imaging requires'
-            'python-pytest>=3.3: For testing suite'
-            'python-mock: For testing suite'
-            'python-pytest-xvfb: For testing suite')
-install=python-sherpa.install
+makedepends=('python>=3.5' 'python-numpy' 'fftw' 'python-setuptools' 'gcc-fortran' 'python-sphinx>=1.3')
 source=("https://files.pythonhosted.org/packages/source/s/sherpa/sherpa-${pkgver}.tar.gz"
         'sherpa_local_fftw.patch')
-md5sums=('ac7f1d7e7ea835719a184a4dd3218743'
+md5sums=('28137b797633670373e6d729c8d02501'
          'd1823cc7683442d92450fadff7aed362')
 
 prepare() {
@@ -27,12 +19,39 @@ prepare() {
     patch -Np1 -i "${srcdir}/sherpa_local_fftw.patch"
 }
 
-package() {
+build() {
     unset LDFLAGS
     cd ${srcdir}/sherpa-${pkgver}
+    python setup.py build
 
-    install -D -m644 {docs/SherpaQuickStart.ipynb,README.md,CITATION} -t "${pkgdir}/usr/share/doc/${pkgname}"
+    msg "Building Docs"
+    python setup.py build_sphinx
+}
+
+package_python-sherpa() {
+    depends=('python>=3.5' 'python-numpy' 'fftw')
+    optdepends=('python-matplotlib: Graphical output'
+                'python-astropy: Data I/O support'
+                'ds9-bin: Imaging requires'
+                'xpa: Imaging requires'
+                'python-pytest>=3.3: For testing suite'
+                'python-mock: For testing suite'
+                'python-pytest-xvfb: For testing suite'
+                'python-sherpa-doc: Documentation for Sherpa')
+    install=python-sherpa.install
+    cd ${srcdir}/sherpa-${pkgver}
+
+    install -D -m644 {README.md,CITATION} -t "${pkgdir}/usr/share/doc/${pkgname}"
+    install -D -m644 notebooks/SherpaQuickStart.ipynb -t "${pkgdir}/usr/share/doc/${pkgname}/notebooks"
     install -D -m644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
     python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-    rm ${pkgdir}/usr/lib/python3.6/site-packages/sherpa-${pkgver}-py3.6.egg-info/SOURCES.txt
+    rm ${pkgdir}/usr/lib/python3.7/site-packages/sherpa-${pkgver}-py3.7.egg-info/SOURCES.txt
+}
+
+package_python-sherpa-doc() {
+    pkgdesc="Documentation for Sherpa"
+    cd ${srcdir}/sherpa-${pkgver}/build/sphinx
+
+    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
+    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
 }