Update to version 1.0

3 files changed, 12 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7feb00fd324f..11a2c3a19655 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,26 @@
 pkgbase = python-pyvo
 	pkgdesc = Astropy affiliated package for accessing Virtual Observatory data and services
-	pkgver = 0.9.3
+	pkgver = 1.0
 	pkgrel = 1
 	url = https://pyvo.readthedocs.io/
 	arch = i686
 	arch = x86_64
 	license = BSD
-	checkdepends = python2-pytest<3.7
 	checkdepends = python-pytest-astropy
-	checkdepends = python2-astropy
-	checkdepends = python2-contextlib2
 	checkdepends = python-requests-mock
-	checkdepends = python2-requests-mock
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	makedepends = python-mimeparse
-	makedepends = python2-mimeparse
-	makedepends = wcslib<6.3
 	makedepends = python-astropy
 	makedepends = python-astropy-helpers>=3.1
-	makedepends = python2-astropy-helpers
 	makedepends = python-sphinx-astropy
-	source = https://files.pythonhosted.org/packages/source/p/pyvo/pyvo-0.9.3.tar.gz
-	md5sums = 1729177d138a22f10eeebbe4eb973d7e
+	source = https://files.pythonhosted.org/packages/source/p/pyvo/pyvo-1.0.tar.gz
+	md5sums = c0cd177c6871c91ba8d8fed5322c2d80
 
 pkgname = python-pyvo
-	depends = wcslib<6.3
 	depends = python-astropy
 	depends = python-requests
 	optdepends = python-pyvo-doc: Documentation for PyVO
 
-pkgname = python2-pyvo
-	depends = wcslib<6.3
-	depends = python2-astropy
-	depends = python2-requests
-	optdepends = python-pyvo-doc: Documentation for PyVO
-
 pkgname = python-pyvo-doc
 	pkgdesc = Documentation for Python PyVO module
 
diff --git a/.gitignore b/.gitignore
index 1df7b618a7b3..0d6e3b36c63a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ pkg
 *.tar.bz2
 *.part
 *.pkg.tar.xz
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 8f150ed60bbc..da66c3bc589f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,25 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-pyvo
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.9.3
+pkgname=("python-${_pyname}" "python-${_pyname}-doc")
+pkgver=1.0
 pkgrel=1
 pkgdesc="Astropy affiliated package for accessing Virtual Observatory data and services"
 arch=('i686' 'x86_64')
 url="https://pyvo.readthedocs.io/"
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-mimeparse' 'python2-mimeparse' 'wcslib<6.3' 'python-astropy' 'python-astropy-helpers>=3.1' 'python2-astropy-helpers' 'python-sphinx-astropy')
-checkdepends=('python2-pytest<3.7'
-              'python-pytest-astropy'
-              'python2-astropy'
-              'python2-contextlib2'
-              'python-requests-mock'
-              'python2-requests-mock')
+makedepends=('python-setuptools' 'python-mimeparse' 'python-astropy' 'python-astropy-helpers>=3.1' 'python-sphinx-astropy')
+checkdepends=('python-pytest-astropy' 'python-requests-mock')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('1729177d138a22f10eeebbe4eb973d7e')
+md5sums=('c0cd177c6871c91ba8d8fed5322c2d80')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    sed -i -e '/auto_use/s/True/False/' setup.cfg
 
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+    sed -i -e '/auto_use/s/True/False/' setup.cfg
 }
 
 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
 
@@ -39,29 +28,13 @@ build() {
 }
 
 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-pyvo() {
-    depends=('wcslib<6.3' 'python2-astropy' 'python2-requests')
-    optdepends=('python-pyvo-doc: Documentation for PyVO')
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-
-    install -D -m644 licenses/* -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
-    mv ${pkgdir}/usr/bin/ex_casA_image_cat.py ${pkgdir}/usr/bin/ex_casA_image_cat2.py
-    mv ${pkgdir}/usr/bin/ex_get_cutouts.py ${pkgdir}/usr/bin/ex_get_cutouts2.py
+    python setup.py test
 }
 
 package_python-pyvo() {
-    depends=('wcslib<6.3' 'python-astropy' 'python-requests')
+    depends=('python-astropy' 'python-requests')
     optdepends=('python-pyvo-doc: Documentation for PyVO')
     cd ${srcdir}/${_pyname}-${pkgver}