Update to version 0.5

3 files changed, 31 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82be9a1b956b..122f77ef2fe9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,26 @@
 pkgbase = python-astropy-healpix
 	pkgdesc = BSD-licensed HEALPix for Astropy
-	pkgver = 0.4
-	pkgrel = 2
+	pkgver = 0.5
+	pkgrel = 1
 	url = http://astropy-healpix.readthedocs.io/
 	arch = i686
 	arch = x86_64
 	license = BSD
-	checkdepends = python2-pytest32
-	checkdepends = python2-healpy
-	checkdepends = python2-hypothesis
+	checkdepends = python-pytest-astropy
+	checkdepends = python-hypothesis
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	makedepends = python2-numpy
 	makedepends = python-astropy
-	makedepends = python-astropy-helpers31
-	makedepends = python2-astropy-helpers
+	makedepends = python-astropy-helpers
 	makedepends = python-sphinx-astropy
-	source = https://files.pythonhosted.org/packages/source/a/astropy-healpix/astropy-healpix-0.4.tar.gz
-	source = python2-astropy-healpix.install
+	source = https://files.pythonhosted.org/packages/source/a/astropy-healpix/astropy-healpix-0.5.tar.gz
 	source = fix_deprecation_warning.patch
-	md5sums = 59174f71ae6ef8b8969b2cfce702231e
-	md5sums = 68d099a7f241f405c488da6f09618890
+	md5sums = 8e474c70da122ff44cb4743176936391
 	md5sums = 71e532a1fed7a57d4ccf0d3e41035dd8
 
 pkgname = python-astropy-healpix
-	depends = python>=3.5
-	depends = python-numpy>=1.10
-	depends = python-astropy>=1.2
-	optdepends = python-astropy-healpix-doc: Documentation for Astropy-HEALPix
-	optdepends = python-pytest-astropy: For testing
-	optdepends = python-astropy<3.2: For testing
-
-pkgname = python2-astropy-healpix
-	install = python2-astropy-healpix.install
-	depends = python2>=2.7
-	depends = python2-numpy>=1.10
-	depends = python2-astropy>=1.2
+	depends = python>=3.6
+	depends = python-numpy>=1.11
+	depends = python-astropy>=2.0
 	optdepends = python-astropy-healpix-doc: Documentation for Astropy-HEALPix
 
 pkgname = python-astropy-healpix-doc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..0d6e3b36c63a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+src
+pkg
+*.src.tar.gz
+*.tar.gz
+*.tar.bz2
+*.part
+*.pkg.tar.xz
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index aa46e0cde41d..33f6c93b0673 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,30 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-astropy-healpix
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.4
-pkgrel=2
+pkgname=("python-${_pyname}" "python-${_pyname}-doc")
+pkgver=0.5
+pkgrel=1
 pkgdesc="BSD-licensed HEALPix for Astropy"
 arch=('i686' 'x86_64')
 url="http://astropy-healpix.readthedocs.io/"
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python2-numpy' 'python-astropy' 'python-astropy-helpers31' 'python2-astropy-helpers' 'python-sphinx-astropy')
-checkdepends=('python2-pytest32'
-#             'python-pytest-astropy'
-              'python2-healpy'
+makedepends=('python-setuptools' 'python-astropy' 'python-astropy-helpers' 'python-sphinx-astropy')
+checkdepends=('python-pytest-astropy'
 #             'python-healpy'
-#             'python-hypothesis'
-              'python2-hypothesis')
+              'python-hypothesis')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
-        "python2-${_pyname}.install"
         'fix_deprecation_warning.patch')
-md5sums=('59174f71ae6ef8b8969b2cfce702231e'
-         '68d099a7f241f405c488da6f09618890'
+md5sums=('8e474c70da122ff44cb4743176936391'
          '71e532a1fed7a57d4ccf0d3e41035dd8')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
     sed -i -e '/auto_use/s/True/False/' setup.cfg
-    patch -Np1 -i "${srcdir}/fix_deprecation_warning.patch"
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+#   patch -Np1 -i "${srcdir}/fix_deprecation_warning.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
 
@@ -44,33 +33,14 @@ build() {
 }
 
 check() {
-#   msg "Checking Python3"
-#   cd ${srcdir}/${_pyname}-${pkgver}
-#   python setup.py test
-
-    if [ -z $(pacman -Qsq python2-pytest-cov) ]; then
-#       msg "Checking Python2"
-        cd ${srcdir}/${_pyname}-${pkgver}-py2
-        python2 setup.py test
-    fi
-}
-
-package_python2-astropy-healpix() {
-    depends=('python2>=2.7' 'python2-numpy>=1.10' 'python2-astropy>=1.2')
-    optdepends=('python-astropy-healpix-doc: Documentation for Astropy-HEALPix')
-    install=python2-${_pyname}.install
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
+    cd ${srcdir}/${_pyname}-${pkgver}
 
-    install -D -m644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+    python setup.py test
 }
 
 package_python-astropy-healpix() {
-    depends=('python>=3.5' 'python-numpy>=1.10' 'python-astropy>=1.2')
-    optdepends=('python-astropy-healpix-doc: Documentation for Astropy-HEALPix'
-                'python-pytest-astropy: For testing'
-                'python-astropy<3.2: For testing')
+    depends=('python>=3.6' 'python-numpy>=1.11' 'python-astropy>=2.0')
+    optdepends=('python-astropy-healpix-doc: Documentation for Astropy-HEALPix')
     cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -82,6 +52,7 @@ package_python-astropy-healpix-doc() {
     pkgdesc="Documentation for AstroPy-HEALPix"
     cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE.md
     install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
     cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
 }