Update to version 0.6.1

2 files changed, 51 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75587b2a7993..e387e792908e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,35 @@
 pkgbase = python-spectral-cube
 	pkgdesc = Library for reading and analyzing astrophysical spectral data cubes
-	pkgver = 0.6.0
+	pkgver = 0.6.1
 	pkgrel = 1
 	url = http://spectral-cube.readthedocs.io
 	arch = any
 	license = BSD
-	makedepends = python-setuptools
+	makedepends = python-setuptools-scm
+	makedepends = python-wheel
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-sphinx-astropy
-	makedepends = python-astropy
 	makedepends = python-dask
-	makedepends = python-toolz
 	makedepends = python-radio_beam
 	makedepends = python-casa-formats-io
-	source = https://files.pythonhosted.org/packages/source/s/spectral-cube/spectral-cube-0.6.0.tar.gz
-	md5sums = 3bde90bb005a31a4e138ca84f30ec367
+	source = https://files.pythonhosted.org/packages/source/s/spectral-cube/spectral-cube-0.6.1.tar.gz
+	md5sums = db0b768215175a955c7ca7547b76f932
 
 pkgname = python-spectral-cube
 	depends = python-numpy>=1.8
 	depends = python-astropy>=4.0
-	depends = python-radio_beam
+	depends = python-radio_beam>=0.3.3
 	depends = python-joblib
 	depends = python-dask
-	depends = python-toolz
 	depends = python-six
-	depends = python-fsspec
-	depends = python-zarr
 	depends = python-casa-formats-io
 	optdepends = python-scipy: Used for subcube creation
 	optdepends = python-bottleneck: Speeds up median and percentile operations on cubes with missing data
-	optdepends = python-regions>=0.3: Serialises/Deserialises DS9/CRTF region files and handles them. Used when extracting a subcube from region
+	optdepends = python-regions>=0.7: Serialises/Deserialises DS9/CRTF region files and handles them. Used when extracting a subcube from region
 	optdepends = python-spectral-cube-doc: Documentation for spectral-cube
+	optdepends = python-fsspec: Used for storing computations to disk when using the dask-enabled classes
+	optdepends = python-zarr: Used for storing computations to disk when using the dask-enabled classes
 
 pkgname = python-spectral-cube-doc
 	pkgdesc = Documentation for Python Radio Beam module
diff --git a/PKGBUILD b/PKGBUILD
index 63bee9051a4e..cc8cd7550b95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,73 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
+
 pkgbase=python-spectral-cube
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Library for reading and analyzing astrophysical spectral data cubes"
 arch=('any')
 url="http://spectral-cube.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools' 'python-sphinx-astropy' 'python-astropy' 'python-dask' 'python-toolz' 'python-radio_beam' 'python-casa-formats-io')
-#checkdepends=('python-pytest-astropy-header' 'python-joblib' 'python-reproject' 'python-bottleneck')
+makedepends=('python-setuptools-scm'
+             'python-wheel'
+             'python-build'
+             'python-installer'
+             'python-sphinx-astropy'
+             'python-dask'
+             'python-radio_beam'
+             'python-casa-formats-io'
+             )
+#checkdepends=('python-pytest-astropy-header'
+#              'python-joblib'
+#              'python-reproject'
+#              'python-six'
+#              'python-bottleneck'
+#              'python-zarr'
+#              'python-aplpy'
+#              'python-pvextractor'
+#              'python-regions'
+#              'python-yt'
+#              'python-glue-core') # dask radio_beam 'python-casa-formats-io' already in makedepends
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('3bde90bb005a31a4e138ca84f30ec367')
-
-prepare() {
-    cd ${srcdir}/${_pyname}-${pkgver}
+md5sums=('db0b768215175a955c7ca7547b76f932')
 
-#   patch -Np1 -i "${srcdir}/fix_doc_version.patch"
-    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+get_pyver() {
+    python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
 }
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
     msg "Building Docs"
-    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-    ln -rs ${srcdir}/${_pyname}-${pkgver}/${_pyname/-/_}*egg-info \
-        build/lib/${_pyname/-/_}-${pkgver}-py${_pyver}.egg-info
-    cd ${srcdir}/${_pyname}-${pkgver}/docs
-    PYTHONPATH="../build/lib" make html
+#   ln -rs ${srcdir}/${_pyname}-${pkgver}/${_pyname/-/_}*egg-info \
+#       build/lib/${_pyname/-/_}-${pkgver}-py$(get_pyver .).egg-info
+#   PYTHONPATH="../build/lib" make -C docs html
 }
 
-#check() {  # Takes over 15 min
+#check() {  # Takes over 20 min, lots of fails
 #    cd ${srcdir}/${_pyname}-${pkgver}
 #
-#    pytest #|| warning "Tests failed"
+#    pytest \
+#        --deselect=spectral_cube/tests/test_io.py::test_3d_beams_roundtrip[True] \
+#        --deselect=spectral_cube/tests/test_io.py::test_4d_beams_roundtrip[True] \
+#        --deselect=spectral_cube/tests/test_spectral_cube.py::test_read_write_rountrip[True] || warning "Tests failed" -vv --color=yes
 #}
 
 package_python-spectral-cube() {
-    depends=('python-numpy>=1.8' 'python-astropy>=4.0' 'python-radio_beam' 'python-joblib' 'python-dask' 'python-toolz' 'python-six' 'python-fsspec' 'python-zarr' 'python-casa-formats-io')
+    depends=('python-numpy>=1.8' 'python-astropy>=4.0' 'python-radio_beam>=0.3.3' 'python-joblib' 'python-dask' 'python-six' 'python-casa-formats-io')
     optdepends=('python-scipy: Used for subcube creation'
                 'python-bottleneck: Speeds up median and percentile operations on cubes with missing data'
-                'python-regions>=0.3: Serialises/Deserialises DS9/CRTF region files and handles them. Used when extracting a subcube from region'
-                'python-spectral-cube-doc: Documentation for spectral-cube')
+                'python-regions>=0.7: Serialises/Deserialises DS9/CRTF region files and handles them. Used when extracting a subcube from region'
+                'python-spectral-cube-doc: Documentation for spectral-cube'
+                'python-fsspec: Used for storing computations to disk when using the dask-enabled classes'
+                'python-zarr: Used for storing computations to disk when using the dask-enabled classes')
     cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
     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-spectral-cube-doc() {