Update to version 0.3.3

1 files changed, 18 insertions, 36 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3dd96322730e..6dba73f66d15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,57 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-radio_beam
-_pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.3.2
+_pname=${pkgbase#python-}
+_pyname=${_pname/_/-}
+pkgname=("python-${_pname}" "python-${_pname}-doc")
+pkgver=0.3.3
 pkgrel=1
 pkgdesc="A tool for manipulating and utilizing two dimensional gaussian beams within the astropy framework"
 arch=('i686' 'x86_64')
-url="https://radio-beam.readthedocs.io/"
+url="https://radio-beam.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-astropy' 'python-astropy-helpers' 'python2-astropy-helpers' 'python-sphinx-astropy')
-checkdepends=('python-pytest-astropy')
-#'python2-pytest<3.7' 'python2-astropy')
+makedepends=('python-setuptools' 'python-astropy' 'python-sphinx-astropy')
+checkdepends=('python-pytest-astropy' 'python-scipy')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('9bf93952bcf371a0574df393a897fe89')
+md5sums=('1a019b5fb8f3449710c028f777316e38')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    sed -i -e '/auto_use/s/True/False/' setup.cfg
 
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+    sed -i "/^version/c version = release = '${pkgver}'" docs/conf.py
 }
 
 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() {
-#   msg "Checking Python3"
-#   cd ${srcdir}/${_pyname}-${pkgver}
-#   python setup.py test
-#
-#   msg "Checking Python2"
-#   cd ${srcdir}/${_pyname}-${pkgver}-py2
-#   python2 setup.py test
-#}
-
-package_python2-radio_beam() {
-    depends=('python2' 'python2-astropy')
-    optdepends=('python2-pytest32: For testing'
-                'python-radio_beam-doc: Documentation for Radio Beam')
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
+check() {
+   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}"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+   pytest "build/lib"
 }
 
 package_python-radio_beam() {
-    depends=('python' 'python-astropy')
+    depends=('python' 'python-astropy' 'python-six' 'python-scipy')
     optdepends=('python-pytest-astropy: For testing'
                 'python-radio_beam-doc: Documentation for Radio Beam')
     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
+    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 }
 
 package_python-radio_beam-doc() {
     pkgdesc="Documentation for Python Radio Beam module"
     cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
+    install -D -m644 ../../LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
     cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
 }