Version bump to 0.1.30

2 files changed, 24 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a32e947bd5f..350f74e2d548 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,15 @@
 pkgbase = python-weblib
 	pkgdesc = Set of tools for web scraping projects
-	pkgver = 0.1.20
+	pkgver = 0.1.30
 	pkgrel = 1
-	url = https://pypi.python.org/pypi/weblib
+	url = https://pypi.org/project/weblib
 	arch = any
 	license = MIT
-	makedepends = python
-	makedepends = python2
-	source = https://pypi.python.org/packages/source/w/weblib/weblib-0.1.20.tar.gz
-	sha256sums = d49687b97ecb61cb7ab4df947f1f0b084a3514476fa910a9d3b554876e05bdbb
-
-pkgname = python-weblib
-	depends = python
+	makedepends = python-setuptools
 	depends = python-lxml
 	depends = python-six
 	depends = python-pytils
+	source = https://pypi.org/packages/source/w/weblib/weblib-0.1.30.tar.gz
+	sha512sums = 325a52a5fe4d7f5a2f963dc883eeb5b263cdb5bcea1f34a21ac0cf8192921404bf2561c8062d186476a08b636298c07c4cc10dc97239f16816761f8b1793594b
 
-pkgname = python2-weblib
-	depends = python2
-	depends = python2-lxml
-	depends = python2-six
-	depends = python2-pytils
-
+pkgname = python-weblib
diff --git a/PKGBUILD b/PKGBUILD
index e9d6e2087f51..5b9e7a69fd9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,25 @@
-# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
 # Contributor: Sergey Mastykov <smastykov[at]gmail[dot]com>
-
-pkgbase=python-weblib
-pkgname=('python-weblib' 'python2-weblib')
-pkgver=0.1.20
-pkgrel=1 
+_base=weblib
+pkgname=python-${_base}
 pkgdesc="Set of tools for web scraping projects"
-arch=('any')
-url="https://pypi.python.org/pypi/weblib"
-license=('MIT')
-makedepends=('python' 'python2')
-source=(https://pypi.python.org/packages/source/w/weblib/weblib-${pkgver}.tar.gz)
-sha256sums=('d49687b97ecb61cb7ab4df947f1f0b084a3514476fa910a9d3b554876e05bdbb')
+pkgver=0.1.30
+pkgrel=1
+arch=(any)
+url="https://pypi.org/project/${_base}"
+license=(MIT)
+depends=(python-lxml python-six python-pytils)
+makedepends=(python-setuptools)
+source=(https://pypi.org/packages/source/${_base::1}/${_base}/${_base}-${pkgver}.tar.gz)
+sha512sums=('325a52a5fe4d7f5a2f963dc883eeb5b263cdb5bcea1f34a21ac0cf8192921404bf2561c8062d186476a08b636298c07c4cc10dc97239f16816761f8b1793594b')
 
 build() {
-  cd $srcdir
-  cp -r weblib-$pkgver weblib2-$pkgver
-}
-
-check() {
-  cd $srcdir/weblib-$pkgver 
-  python3 setup.py check
-  
-  cd $srcdir/weblib2-$pkgver 
-  python2 setup.py check  
+  cd ${_base}-${pkgver}
+  export PYTHONHASHSEED=0
+  python setup.py build
 }
 
-package_python-weblib() {
-  depends=('python' 'python-lxml' 'python-six' 'python-pytils')
-  cd "$srcdir/weblib-$pkgver"
-  python3 setup.py install --root "${pkgdir}" --optimize=1
+package() {
+  cd ${_base}-${pkgver}
+  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
-
-package_python2-weblib() {
-  depends=('python2' 'python2-lxml' 'python2-six' 'python2-pytils')
-  cd "$srcdir/weblib2-$pkgver"
-  python2 setup.py install --root "${pkgdir}" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et: