Make check() more robust.

2 files changed, 22 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64dd66d3a7cc..1e55e83b3f2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = python-pyscipopt-git
-	pkgdesc = A Python Interface to the SCIP Optimization Suite. Git version.
+	pkgdesc = A Python interface to the SCIP Optimization Suite. Git version.
 	pkgver = 3.1.0.r3.gdc8e592
-	pkgrel = 1
-	url = http://scip.zib.de
+	pkgrel = 2
+	url = https://www.scipopt.org/
 	arch = any
 	license = MIT
 	makedepends = git
@@ -10,6 +10,7 @@ pkgbase = python-pyscipopt-git
 	makedepends = python-setuptools
 	depends = python
 	depends = scipoptsuite
+	provides = python-pyscipopt
 	conflicts = python-pyscipopt
 	source = python-pyscipopt-git::git+https://github.com/SCIP-Interfaces/PySCIPOpt.git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 100d14e0c3ae..da3c8bb44ad3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,32 @@
 
 pkgname=python-pyscipopt-git
 pkgver=3.1.0.r3.gdc8e592
-pkgrel=1
-pkgdesc='A Python Interface to the SCIP Optimization Suite. Git version.'
+pkgrel=2
+pkgdesc='A Python interface to the SCIP Optimization Suite. Git version.'
 arch=('any')
-url='http://scip.zib.de'
+url='https://www.scipopt.org/'
 license=('MIT')
 depends=('python' 'scipoptsuite')
 makedepends=('git' 'cython' 'python-setuptools')
+provides=('python-pyscipopt')
 conflicts=('python-pyscipopt')
 source=("${pkgname}::git+https://github.com/SCIP-Interfaces/PySCIPOpt.git")
+md5sums=('SKIP')
 
-pkgver() {
-	cd "${srcdir}/${pkgbase}"
-	git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+build() {
+	cd "${srcdir}/${pkgname}"
+	python setup.py build
 }
 
-package() {
-	cd "${srcdir}/${pkgbase}"
-	python setup.py install --root=${pkgdir} --optimize=1
+check() {
+	_arch="linux-$(uname -m)"
+	_pymajver="$(python -V | sed 's/Python \([0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/')"
+
+	cd "${srcdir}/${pkgname}/build/lib.${_arch}-${_pymajver}"
+	python -Bc "import pyscipopt"
 }
 
-md5sums=('SKIP')
+package() {
+	cd "${srcdir}/${pkgname}"
+	python setup.py install --root=${pkgdir} --optimize=1 --skip-build
+}