update to 2.0, drop python2

2 files changed, 30 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83caf1ebc11c..a5f895d56fa7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = pyhamcrest-git
-	pkgdesc = A framework for writing matcher objects, allowing you to declaratively define "match" rules
-	pkgver = 1.8.2.r18.g6d8389a
+	pkgdesc = Hamcrest framework for matcher objects
+	pkgver = 2.0.2.r23.g00bd42e
 	pkgrel = 1
 	url = https://github.com/hamcrest/PyHamcrest
 	arch = any
 	license = BSD
-	makedepends = python2-setuptools
+	checkdepends = python-pytest-runner
+	checkdepends = python-pytest-cov
+	checkdepends = python-mock
+	checkdepends = python-numpy
 	makedepends = python-setuptools
+	depends = python-six
 	source = git+https://github.com/hamcrest/PyHamcrest.git
 	md5sums = SKIP
 
-pkgname = python2-pyhamcrest-git
-
 pkgname = python-pyhamcrest-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f5437daa4bac..b07cfa31aad9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,38 @@
-# Maintainer: lestb <tkhdlstfl dot l plus aur at gmail dot com>
-# Package Repository: https://github.com/mij-aur-packages/pyhamcrest-git
+# Contributor: lestb <tkhdlstfl dot l plus aur at gmail dot com>
+# Contributor: Michal Wojdyla < micwoj9292 at gmail dot com >
 
-_pkgname=PyHamcrest
-pkgbase=${_pkgname,,}-git
-pkgname=(python{2,}-pyhamcrest-git)
-pkgver=1.8.2.r18.g6d8389a
+pkgbase=pyhamcrest-git
+pkgname=python-pyhamcrest-git
+pkgver=2.0.2.r23.g00bd42e
 pkgrel=1
-pkgdesc='A framework for writing matcher objects, allowing you to declaratively define "match" rules'
+pkgdesc='Hamcrest framework for matcher objects'
 arch=('any')
-url="https://github.com/hamcrest/PyHamcrest"
 license=('BSD')
-makedepends=(python{2,}-setuptools)
-source=("git+https://github.com/hamcrest/${_pkgname}.git")
+url="https://github.com/hamcrest/PyHamcrest"
+depends=('python-six')
+makedepends=('python-setuptools')
+checkdepends=('python-pytest-runner' 'python-pytest-cov' 'python-mock' 'python-numpy')
+              
+source=("git+${url}.git")
 md5sums=('SKIP')
 
 pkgver() {
-    cd "${_pkgname}"
+    cd PyHamcrest
     git describe --tags --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^V//'
 }
 
 build() {
-    for pybin in python python2; do
-        _dir="${srcdir}/${pybin}-${_pkgname}-${pkgver}"
-        mkdir -p "${_dir}"
-        cd "${_dir}"
-        cp -r "${srcdir}/${_pkgname}"/. .
-        ${pybin} setup.py build
-    done
+  cd "$srcdir"/PyHamcrest
+  python setup.py build
 }
 
-_package() {
-    pybin=$1
-    depends=(${pybin})
-    cd "${srcdir}/${pybin}-${_pkgname}-${pkgver}"
-    ${pybin} setup.py install --root="${pkgdir}" --optimize=1
-    install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+check() {
+  cd "$srcdir"/PyHamcrest
+  python setup.py pytest
 }
 
-for _name in "${pkgname[@]}"; do
-    _splitname=(${_name//-/ }) # For retriving the python version needed
-    eval "package_${_name}() { _package ${_splitname[0]}; }"
-done
+package() {
+  cd "$srcdir"/PyHamcrest
+  python setup.py install --root="$pkgdir" --optimize=1
+  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+}