Update to version 0.5.0

4 files changed, 56 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef6d0ae3aa19..62187de1cc81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,41 @@
 pkgbase = python-spectral-cube
 	pkgdesc = Library for reading and analyzing astrophysical spectral data cubes
-	pkgver = 0.4.5
+	pkgver = 0.5.0
 	pkgrel = 1
-	url = http://spectral-cube.readthedocs.io/
+	url = http://spectral-cube.readthedocs.io
 	arch = i686
 	arch = x86_64
 	license = BSD
-	checkdepends = python-pytest-astropy
+	checkdepends = python-pytest-astropy-header
+	checkdepends = python-joblib
+	checkdepends = python-reproject
 	checkdepends = python-bottleneck
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	makedepends = python-astropy-helpers>=3.1
-	makedepends = python2-astropy-helpers
-	makedepends = python-radio_beam
 	makedepends = python-sphinx-astropy
-	source = https://files.pythonhosted.org/packages/source/s/spectral-cube/spectral-cube-0.4.5.tar.gz
-	md5sums = ebae737589d3931a7ae9cbf1c95909f6
+	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 = 724c19919a17ff4be5ff5a7747ee6307
 
 pkgname = python-spectral-cube
 	depends = python
 	depends = python-numpy>=1.8
 	depends = python-astropy>=1.0
 	depends = python-radio_beam
+	depends = python-joblib
+	depends = python-dask
+	depends = python-toolz
+	depends = python-six
+	depends = python-fsspec
+	depends = python-zarr
 	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 = python2-spectral-cube
-	depends = python2>=2.7
-	depends = python2-numpy>=1.8
-	depends = python2-astropy>=1.0
-	depends = python2-radio_beam
-	optdepends = python2-bottleneck: Speeds up median and percentile operations on cubes with missing data
-	optdepends = python-spectral-cube-doc: Documentation for spectral-cube
-	optdepends = python2-pytest<3.7: For testing
-
 pkgname = python-spectral-cube-doc
 	pkgdesc = Documentation for Python Radio Beam module
 
diff --git a/.gitignore b/.gitignore
index 0d6e3b36c63a..e896dcd6056d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@ pkg
 *.tar.gz
 *.tar.bz2
 *.part
-*.pkg.tar.xz
+*.pkg.tar.*
 *.log
diff --git a/PKGBUILD b/PKGBUILD
index 619e8ddec0ce..467f1b4f808c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,51 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-spectral-cube
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.4.5
+pkgname=("python-${_pyname}" "python-${_pyname}-doc")
+pkgver=0.5.0
 pkgrel=1
 pkgdesc="Library for reading and analyzing astrophysical spectral data cubes"
 arch=('i686' 'x86_64')
-url="http://spectral-cube.readthedocs.io/"
+url="http://spectral-cube.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-astropy-helpers>=3.1' 'python2-astropy-helpers' 'python-radio_beam' 'python-sphinx-astropy')
-checkdepends=('python-pytest-astropy' 'python-bottleneck')
-source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('ebae737589d3931a7ae9cbf1c95909f6')
+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'
+         '724c19919a17ff4be5ff5a7747ee6307')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    sed -i -e '/auto_use/s/True/False/' setup.cfg
 
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+    patch -Np1 -i "${srcdir}/fix_doc_version.patch"
 }
 
 build() {
-    msg "Building Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py build --use-system-libraries --offline
-
-    msg "Building Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build --use-system-libraries --offline
+    python setup.py build
 
     msg "Building Docs"
-    python setup.py build_docs
+    cd ${srcdir}/${_pyname}-${pkgver}/docs
+    PYTHONPATH="../build/lib" make html
 }
 
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py test
-
-#   cd ${srcdir}/${_pyname}-${pkgver}-py2
-#   python2 setup.py test
-}
 
-package_python2-spectral-cube() {
-    depends=('python2>=2.7' 'python2-numpy>=1.8' 'python2-astropy>=1.0' 'python2-radio_beam')
-    optdepends=('python2-bottleneck: Speeds up median and percentile operations on cubes with missing data'
-                'python-spectral-cube-doc: Documentation for  spectral-cube'
-                'python2-pytest<3.7: For testing')
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-
-    install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+    pytest || warning "Tests failed"
 }
 
 package_python-spectral-cube() {
-    depends=('python' 'python-numpy>=1.8' 'python-astropy>=1.0' 'python-radio_beam')
+    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'
                 '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}
 
     install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+    install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
+    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 }
 
 package_python-spectral-cube-doc() {
diff --git a/fix_doc_version.patch b/fix_doc_version.patch
new file mode 100644
index 000000000000..bf7d316858bb
--- /dev/null
+++ b/fix_doc_version.patch
@@ -0,0 +1,19 @@
+--- a/docs/conf.py	2020-09-18 04:29:50.000000000 +0800
++++ b/docs/conf.py	2020-09-18 16:05:29.462123649 +0800
+@@ -76,8 +76,14 @@
+ # |version| and |release|, also used in various other places throughout the
+ # built documents.
+ 
+-from pkg_resources import get_distribution
+-version = release = get_distribution(setup_cfg['name']).version
++from pkg_resources import get_distribution, DistributionNotFound
++try:
++    __version__ = get_distribution(__name__)
++except DistributionNotFound:
++    __version__ = 'unknown'
++
++version = __version__
++release = __version__
+ 
+ # -- Options for HTML output --------------------------------------------------
+