remove py2 from package

2 files changed, 22 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4fa0c61ee02..aaae78483864 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,15 @@
 pkgbase = python-plaster
 	pkgdesc = A loader interface around multiple config file formats.
 	pkgver = 1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Pylons/plaster
 	arch = any
 	license = MIT
 	checkdepends = python-pytest-runner
-	checkdepends = python2-pytest-runner
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://pypi.org/packages/source/p/plaster/plaster-1.0.tar.gz
-	sha256sums = 8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3
+	depends = python
+	source = https://github.com/Pylons/plaster/archive/1.0.tar.gz
+	sha256sums = d998cf4d51ca868f2aa72a7b4901c62183c1da759eacbe4d25a5bd2385f0a7af
 
 pkgname = python-plaster
-	depends = python-setuptools
-
-pkgname = python2-plaster
-	depends = python2-setuptools
 
diff --git a/PKGBUILD b/PKGBUILD
index dae9681d7fd2..7466f26ae6b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,32 @@
-pkgbase=python-plaster
-pkgname=(python-plaster python2-plaster)
+# Maintainer: Aleksandar Trifunović <akstrfn at gmail dot com>
+# Contributor: Chih-Hsuan Yen <yan12125 at gmail dot com>
+
+pkgname=python-plaster
 pkgver=1.0
 _distname=plaster-$pkgver
-pkgrel=1
+pkgrel=2
 pkgdesc="A loader interface around multiple config file formats."
 arch=('any')
 url="https://github.com/Pylons/plaster"
 license=('MIT')
-makedepends=('python-setuptools' 'python2-setuptools')
-checkdepends=('python-pytest-runner' 'python2-pytest-runner')
-source=(https://pypi.org/packages/source/p/plaster/plaster-${pkgver}.tar.gz)
-sha256sums=('8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3')
+depends=('python')
+makedepends=('python-setuptools')
+checkdepends=('python-pytest-runner')
+source=("$url/archive/$pkgver.tar.gz")
+sha256sums=('d998cf4d51ca868f2aa72a7b4901c62183c1da759eacbe4d25a5bd2385f0a7af')
 
-prepare() {
-    cp -r ${_distname}{,-py2}
+build(){
+    cd $_distname
+    python setup.py build
 }
 
-check() {
-    cd "$srcdir"/$_distname
+check(){
+    cd $_distname
     python setup.py pytest -v
-
-    cd "$srcdir"/$_distname
-    python2 setup.py pytest -v
 }
 
-package_python-plaster() {
-    depends=('python-setuptools')
+package(){
     cd $_distname
-    python setup.py install --root="${pkgdir}" --optimize=1
-    install -Ddm755 "$pkgdir"/usr/share/licenses/$pkgname
-    install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/
-}
-
-package_python2-plaster() {
-    depends=('python2-setuptools')
-    cd "$_distname-py2"
-    python2 setup.py install --root="${pkgdir}" --optimize=1
-    install -Ddm755 "$pkgdir"/usr/share/licenses/$pkgname
-    install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/
+    python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+    install -D LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }