Add python3 version + contributed improvements

2 files changed, 52 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8bb4b9bc2857..62a4455343bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,28 @@
-# Generated by mksrcinfo v8
-# Wed Jan 11 11:11:09 UTC 2017
 pkgbase = python-setuptools_trial
 	pkgdesc = Setuptools plugin that makes unit tests execute with trial instead of pyunit
 	pkgver = 0.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/rutsky/setuptools-trial
 	arch = any
 	license = SPL
+	checkdepends = python-pytest-virtualenv
+	checkdepends = python-virtualenv
+	checkdepends = python2-pytest-virtualenv
+	checkdepends = python2-virtualenv
+	makedepends = python-setuptools
+	makedepends = python-twisted
 	makedepends = python2-setuptools
-	source = https://pypi.python.org/packages/6c/d8/2ec30d50a37c90f8b48b22a50e96d4c50fec7e05ca1557bb814dc219ffc3/setuptools_trial-0.6.0.tar.gz
+	makedepends = python2-twisted
+	makedepends = python2-pathlib2
+	source = https://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.6.0.tar.gz
 	md5sums = bca42190adf631b213846c2b33f3676f
 
+pkgname = python-setuptools_trial
+	depends = python
+	depends = python-twisted
+
 pkgname = python2-setuptools_trial
 	depends = python2
 	depends = python2-twisted
+	depends = python2-pathlib2
 
diff --git a/PKGBUILD b/PKGBUILD
index 681803dd6d31..48560318203c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,58 @@
 # Maintainer: Ivan Shapovalov <intelfx@intelfx.name>
 
 pkgbase=python-setuptools_trial
-pkgname=(python2-setuptools_trial)
+pkgname=(python-setuptools_trial python2-setuptools_trial)
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Setuptools plugin that makes unit tests execute with trial instead of pyunit"
 arch=('any')
 license=('SPL')
 url="https://github.com/rutsky/setuptools-trial"
-makedepends=('python2-setuptools')
-source=("https://pypi.python.org/packages/6c/d8/2ec30d50a37c90f8b48b22a50e96d4c50fec7e05ca1557bb814dc219ffc3/setuptools_trial-0.6.0.tar.gz")
+makedepends=('python-setuptools' 'python-twisted'
+             'python2-setuptools' 'python2-twisted' 'python2-pathlib2')
+checkdepends=('python-pytest-virtualenv' 'python-virtualenv'
+              'python2-pytest-virtualenv' 'python2-virtualenv')
+source=("https://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-${pkgver}.tar.gz")
 md5sums=('bca42190adf631b213846c2b33f3676f')
 
+prepare() {
+	cp -a "setuptools_trial-${pkgver}"{,-py2}
+}
+
 build() {
 	cd "${srcdir}/setuptools_trial-${pkgver}"
+	python setup.py build
+
+	cd "${srcdir}/setuptools_trial-${pkgver}-py2"
 	python2 setup.py build
 }
 
-package_python2-setuptools_trial() {
-	depends=('python2' 'python2-twisted')
+check() {
+	cd "${srcdir}/setuptools_trial-${pkgver}"
+	python setup.py test
+
+	cd "${srcdir}/setuptools_trial-${pkgver}-py2"
+	python2 setup.py test
+}
+
+
+package_python-setuptools_trial() {
+	depends=('python' 'python-twisted')
 
 	cd "setuptools_trial-${pkgver}"
+	python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+
+	install -Dm644 COPYING.SPL.txt \
+		"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SPL.txt"
+}
+
+package_python2-setuptools_trial() {
+	depends=('python2' 'python2-twisted' 'python2-pathlib2')
+
+	cd "setuptools_trial-${pkgver}-py2"
 	python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+	# pkg installs things under /usr/share/doc/python-setuptools_trial hardcoded
+	mv "${pkgdir}/usr/share/doc/"{python,python2}-setuptools_trial
 
 	install -Dm644 COPYING.SPL.txt \
 		"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SPL.txt"