Update to version 0.6.0

2 files changed, 27 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ddbf664b0de..75587b2a7993 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,23 @@
 pkgbase = python-spectral-cube
 	pkgdesc = Library for reading and analyzing astrophysical spectral data cubes
-	pkgver = 0.5.0
+	pkgver = 0.6.0
 	pkgrel = 1
 	url = http://spectral-cube.readthedocs.io
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = BSD
-	checkdepends = python-pytest-astropy-header
-	checkdepends = python-joblib
-	checkdepends = python-reproject
-	checkdepends = python-bottleneck
 	makedepends = python-setuptools
 	makedepends = python-sphinx-astropy
 	makedepends = python-astropy
 	makedepends = python-dask
 	makedepends = python-toolz
 	makedepends = python-radio_beam
-	source = https://files.pythonhosted.org/packages/source/s/spectral-cube/spectral-cube-0.5.0.tar.gz
-	source = fix_doc_version.patch
-	md5sums = fd3f45419a4b029887f3187929a321ec
-	md5sums = 0c7fdbb48c8e090e6b29b4d03e6af0bb
+	makedepends = python-casa-formats-io
+	source = https://files.pythonhosted.org/packages/source/s/spectral-cube/spectral-cube-0.6.0.tar.gz
+	md5sums = 3bde90bb005a31a4e138ca84f30ec367
 
 pkgname = python-spectral-cube
-	depends = python
 	depends = python-numpy>=1.8
-	depends = python-astropy>=1.0
+	depends = python-astropy>=4.0
 	depends = python-radio_beam
 	depends = python-joblib
 	depends = python-dask
@@ -32,10 +25,11 @@ pkgname = python-spectral-cube
 	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-spectral-cube-doc: Documentation for spectral-cube
 
 pkgname = python-spectral-cube-doc
 	pkgdesc = Documentation for Python Radio Beam module
-
diff --git a/PKGBUILD b/PKGBUILD
index a734e40cd3c8..63bee9051a4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,22 @@
 pkgbase=python-spectral-cube
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.5.0
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="Library for reading and analyzing astrophysical spectral data cubes"
-arch=('i686' 'x86_64')
+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')
-checkdepends=('python-pytest-astropy-header' 'python-joblib' 'python-reproject' 'python-bottleneck')
-source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
-        'fix_doc_version.patch')
-md5sums=('fd3f45419a4b029887f3187929a321ec'
-         '0c7fdbb48c8e090e6b29b4d03e6af0bb')
+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')
+source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+md5sums=('3bde90bb005a31a4e138ca84f30ec367')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    patch -Np1 -i "${srcdir}/fix_doc_version.patch"
+#   patch -Np1 -i "${srcdir}/fix_doc_version.patch"
+    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
 }
 
 build() {
@@ -26,19 +25,23 @@ build() {
     python setup.py build
 
     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
 }
 
-check() {
-    cd ${srcdir}/${_pyname}-${pkgver}
-
-    pytest || warning "Tests failed"
-}
+#check() {  # Takes over 15 min
+#    cd ${srcdir}/${_pyname}-${pkgver}
+#
+#    pytest #|| warning "Tests failed"
+#}
 
 package_python-spectral-cube() {
-    depends=('python' 'python-numpy>=1.8' 'python-astropy>=1.0' 'python-radio_beam' 'python-joblib' 'python-dask' 'python-toolz' 'python-six' 'python-fsspec' 'python-zarr')
-    optdepends=('python-bottleneck: Speeds up median and percentile operations on cubes with missing data'
+    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')
+    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')
     cd ${srcdir}/${_pyname}-${pkgver}