Add doc

3 files changed, 51 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a21e28aacca6..9613e50462e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,15 +6,17 @@ pkgbase = python-astrodendro
 	arch = any
 	license = MIT
 	checkdepends = python-pytest
-	checkdepends = python-astropy
-	checkdepends = python-matplotlib
 	checkdepends = python-mock
 	checkdepends = python-h5py
 	makedepends = python-setuptools
+	makedepends = python-sphinx-automodapi
+	makedepends = python-aplpy
 	source = https://files.pythonhosted.org/packages/source/a/astrodendro/astrodendro-0.2.0.tar.gz
 	source = fix-collection-py3.10.patch
+	source = new-doc-building.patch
 	md5sums = 6f4155b1d4a4b2d9cb9ae154f88c5710
 	md5sums = 1b5d8b8c5d0387a09b15c02fc1b40714
+	md5sums = 2bd96deeaa18ae57c196246b74ee8030
 
 pkgname = python-astrodendro
 	depends = python
@@ -24,3 +26,7 @@ pkgname = python-astrodendro
 	optdepends = python-matplotlib: For plotting
 	optdepends = python-pytest: For testing
 	optdepends = python-mock: For testing
+	optdepends = python-astrodendro-doc: Documentation for astrodendro
+
+pkgname = python-astrodendro-doc
+	pkgdesc = Documentation for Python astrodendro module
diff --git a/PKGBUILD b/PKGBUILD
index 7c33ebabd69d..63f0d2132774 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,34 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-astrodendro
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}")
-#"python2-${_pyname}")
-#"python-${_pyname}-doc")
+pkgname=("python-${_pyname}" "python-${_pyname}-doc")
 pkgver=0.2.0
 pkgrel=2
 pkgdesc="Python package for computation of astronomical dendrograms"
 arch=('any')
 url="https://dendrograms.readthedocs.io"
 license=('MIT')
-makedepends=('python-setuptools')
+makedepends=('python-setuptools'
 #            'python-wheel'
 #            'python-build'
 #            'python-installer'
-#            'python-sphinx'
-#            'python-matplotlib'
-#            'python-astropy')
+             'python-sphinx-automodapi'
+             'python-aplpy')
 checkdepends=('python-pytest'
-              'python-astropy'
-              'python-matplotlib'
               'python-mock'
-              'python-h5py')
-#'python2-matplotlib' 'python-matplotlib' 'python2-mock' 'python-mock' 'python2-astropy' 'python-astropy')
+              'python-h5py') # 'python-astropy' 'python-matplotlib'
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
-        'fix-collection-py3.10.patch')
+        'fix-collection-py3.10.patch'
+        'new-doc-building.patch')
 md5sums=('6f4155b1d4a4b2d9cb9ae154f88c5710'
-         '1b5d8b8c5d0387a09b15c02fc1b40714')
+         '1b5d8b8c5d0387a09b15c02fc1b40714'
+         '2bd96deeaa18ae57c196246b74ee8030')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
     patch -Np1 -i "${srcdir}/fix-collection-py3.10.patch"
+    patch -Np1 -i "${srcdir}/new-doc-building.patch"
 }
 
 build() {
@@ -39,10 +36,10 @@ build() {
     python setup.py build
 #   python -m build --wheel --no-isolation
 
-#    msg "Building Docs"
-#    cd ${srcdir}/${_pyname}-${pkgver}/docs
+    msg "Building Docs"
+    cd ${srcdir}/${_pyname}-${pkgver}/docs
 ##   python setup.py build_sphinx
-#    PYTHONPATH="../build/lib" make html
+    PYTHONPATH="../build/lib" make html
 }
 
 check() {
@@ -55,7 +52,8 @@ package_python-astrodendro() {
     depends=('python' 'python-numpy>=1.4.1' 'python-astropy>=0.2.0' 'python-h5py>=0.2.0')
     optdepends=('python-matplotlib: For plotting'
                 'python-pytest: For testing'
-                'python-mock: For testing')
+                'python-mock: For testing'
+                'python-astrodendro-doc: Documentation for astrodendro')
     cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -64,10 +62,11 @@ package_python-astrodendro() {
 #   python -m installer --destdir="${pkgdir}" dist/*.whl
 }
 
-#package_python-astrodendro-doc() {
-#    pkgdesc="Documentation for Python astrodendro module"
-#    cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
-#
-#    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
-#    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
-#}
+package_python-astrodendro-doc() {
+    pkgdesc="Documentation for Python astrodendro module"
+    cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
+
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE
+    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
+    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
+}
diff --git a/new-doc-building.patch b/new-doc-building.patch
new file mode 100644
index 000000000000..69db90018156
--- /dev/null
+++ b/new-doc-building.patch
@@ -0,0 +1,20 @@
+--- a/docs/conf.py	2013-11-09 22:35:32.000000000 +0800
++++ b/docs/conf.py	2022-08-22 17:46:15.797621371 +0800
+@@ -28,8 +28,8 @@
+ extensions = ['matplotlib.sphinxext.plot_directive',
+               'sphinx.ext.autodoc',
+               'sphinx.ext.intersphinx',
+-              'astropy.sphinx.ext.numpydoc',
+-              'astropy.sphinx.ext.astropyautosummary'
++              'sphinx_automodapi.automodapi',
++              'sphinx_automodapi.smart_resolver'
+              ]
+ 
+ autosummary_generate = True
+@@ -287,5 +287,5 @@
+     'python': ('http://docs.python.org/', None),
+     'numpy': ('http://docs.scipy.org/doc/numpy/', None),
+     'matplotlib': ('http://matplotlib.sourceforge.net/', None),
+-    'astropy': ('http://www.astropy.org/', None),
++    'astropy': ('http://docs.astropy.org/en/stable/', None),
+     }