Update to 0.9

2 files changed, 34 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a300e51298a..c36640c4cc0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,37 @@
 pkgbase = python-astroplan
 	pkgdesc = A python package to help astronomers plan observations
-	pkgver = 0.8
+	pkgver = 0.9
 	pkgrel = 1
 	url = https://astroplan.readthedocs.io
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = BSD
+	checkdepends = python-pytest-astropy-header
 	checkdepends = python-pytest-doctestplus
+	checkdepends = python-pytest-mpl
+	checkdepends = python-matplotlib
 	makedepends = python-setuptools-scm
+	makedepends = python-wheel
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-sphinx-astropy
+	makedepends = python-sphinx-copybutton
+	makedepends = python-pydata-sphinx-theme
 	makedepends = python-astroquery
 	makedepends = graphviz
-	source = https://files.pythonhosted.org/packages/source/a/astroplan/astroplan-0.8.tar.gz
+	source = https://files.pythonhosted.org/packages/source/a/astroplan/astroplan-0.9.tar.gz
 	source = fix_doc_index_astropy_link.patch
-	md5sums = 5595baf9469ca8c21b5ad05309ec6798
+	md5sums = c79e7c6c8f3d49ba77a29da75b97bf79
 	md5sums = be56be5926b43589b273c16544c5241a
 
 pkgname = python-astroplan
-	depends = python>=3.5
-	depends = python-numpy>=1.10
-	depends = python-astropy>=1.3
+	depends = python>=3.7
+	depends = python-numpy>=1.17
+	depends = python-astropy>=4
 	depends = python-pytz
+	depends = python-six
 	optdepends = python-matplotlib: Plotting support
 	optdepends = python-astroquery: Astroquery support
 	optdepends = python-astroplan-doc: Documentation for astroplan
 
 pkgname = python-astroplan-doc
 	pkgdesc = Documentation for Python astroplan module
-
diff --git a/PKGBUILD b/PKGBUILD
index dc5b4d44f267..49c184784307 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,49 @@
 pkgbase=python-astroplan
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.8
+pkgver=0.9
 pkgrel=1
 pkgdesc="A python package to help astronomers plan observations"
-arch=('i686' 'x86_64')
+arch=('any')
 url="https://astroplan.readthedocs.io"
 license=('BSD')
 makedepends=('python-setuptools-scm'
+             'python-wheel'
+             'python-build'
+             'python-installer'
              'python-sphinx-astropy'
+             'python-sphinx-copybutton'
+             'python-pydata-sphinx-theme'
              'python-astroquery'
              'graphviz')
-checkdepends=('python-pytest-doctestplus')
+checkdepends=('python-pytest-astropy-header'
+              'python-pytest-doctestplus'
+              'python-pytest-mpl'
+              'python-matplotlib') # six <- .. <- matplotlib; pytz -< .. <- sphinx
+#checkdepends=('python-pytest-doctestplus')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
 #       "http://hpiers.obspm.fr/iers/eop/eopc04/eopc04_IAU2000.62-now"
 #       "https://skyview.gsfc.nasa.gov/tempspace/fits/skv9820097384828.fits"
         'fix_doc_index_astropy_link.patch')
-md5sums=('5595baf9469ca8c21b5ad05309ec6798'
+md5sums=('c79e7c6c8f3d49ba77a29da75b97bf79'
          'be56be5926b43589b273c16544c5241a')
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
     msg "Building Docs"
-    cd ${srcdir}/${_pyname}-${pkgver}/docs
-    PYTHONPATH="../build/lib" make html
+    PYTHONPATH="../build/lib" make -C docs html
 }
 
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    pytest "build/lib" || warning "Tests failed"
+    pytest || warning "Tests failed" # -vv -l -ra --color=yes -o console_output_style=count
 }
 
 package_python-astroplan() {
-    depends=('python>=3.5' 'python-numpy>=1.10' 'python-astropy>=1.3' 'python-pytz')
+    depends=('python>=3.7' 'python-numpy>=1.17' 'python-astropy>=4' 'python-pytz' 'python-six')
     optdepends=('python-matplotlib: Plotting support'
                 'python-astroquery: Astroquery support'
                 'python-astroplan-doc: Documentation for astroplan')
@@ -45,7 +53,7 @@ package_python-astroplan() {
     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
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 }
 
 package_python-astroplan-doc() {