Drop python2. Update build commands.

2 files changed, 17 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd222af4ec61..75a11043948a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,18 @@
 pkgbase = python-glog
 	pkgdesc = A simple Google-style logging wrapper for Python
 	pkgver = 0.3.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/benley/python-glog/
 	arch = any
 	license = BSD
-	makedepends = python
-	makedepends = python2
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = python-glog-0.3.1.tar.gz::https://github.com/benley/python-glog/archive/0.3.1.tar.gz
-	sha256sums = b01af6f1118d2fa769c7657971deac8cecd71a3c6afe3e08328366740e802351
-
-pkgname = python-glog
+	makedepends = python-wheel
 	depends = python
 	depends = python-gflags
 	depends = python-six
+	source = python-glog-0.3.1.tar.gz::https://github.com/benley/python-glog/archive/0.3.1.tar.gz
+	sha256sums = b01af6f1118d2fa769c7657971deac8cecd71a3c6afe3e08328366740e802351
 
-pkgname = python2-glog
-	pkgdesc = A simple Google-style logging wrapper for Python2
-	depends = python2
-	depends = python2-gflags
-	depends = python2-six
-
+pkgname = python-glog
diff --git a/PKGBUILD b/PKGBUILD
index 0c3f3b651d2a..65cca58cd834 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,23 @@
 # Maintainer : Daniel Bermond < gmail-com: danielbermond >
 
-pkgbase=python-glog
-pkgname=('python-glog' 'python2-glog')
+pkgname=python-glog
 pkgver=0.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A simple Google-style logging wrapper for Python'
 arch=('any')
 url='https://github.com/benley/python-glog/'
 license=('BSD')
-makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools')
-source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/benley/python-glog/archive/${pkgver}.tar.gz")
+depends=('python' 'python-gflags' 'python-six')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/benley/python-glog/archive/${pkgver}.tar.gz")
 sha256sums=('b01af6f1118d2fa769c7657971deac8cecd71a3c6afe3e08328366740e802351')
 
-prepare() {
-    cp -a "${pkgbase}-${pkgver}" "${pkgbase}-${pkgver}-py2"
-}
-
 build() {
-    printf '%s\n' '  -> Building for Python...'
-    cd "${pkgbase}-${pkgver}"
-    python setup.py build
-    
-    printf '%s\n' '  -> Building for Python2...'
-    cd "${srcdir}/${pkgbase}-${pkgver}-py2"
-    python2 setup.py build
-}
-
-package_python-glog() {
-    depends=('python' 'python-gflags' 'python-six')
-    
-    cd "${pkgbase}-${pkgver}"
-    python setup.py install --root="$pkgdir" --skip-build --optimize='1'
-    
-    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    cd "${pkgname}-${pkgver}"
+    python -m build --wheel --no-isolation
 }
 
-package_python2-glog() {
-    pkgdesc='A simple Google-style logging wrapper for Python2'
-    depends=('python2' 'python2-gflags' 'python2-six')
-    
-    cd "${pkgbase}-${pkgver}-py2"
-    python2 setup.py install --root="$pkgdir" --skip-build --optimize='1'
-    
-    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+package() {
+    python -m installer --destdir="$pkgdir" "${pkgname}-${pkgver}/dist"/*.whl
+    install -D -m644 "${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }