summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Irofti2021-02-10 23:48:39 +0200
committerPaul Irofti2021-02-10 23:48:39 +0200
commitf47b7df3329af21d1254494b7d8d393da15558eb (patch)
treeb07fbdd3a41c7f67bee14ceeb70d6e92b4b4649b
parentaa6df60ae3cb03cdbbe1a671f476e2a52202d4b4 (diff)
downloadaur-f47b7df3329af21d1254494b7d8d393da15558eb.tar.gz
fix versioning and other issues after #archlinux-aur review; thank you!
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD19
2 files changed, 15 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c9fb23a64485..ed51845d0280 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = python-combo-git
pkgdesc = Python toolbox for combining machine learning (ML) models and scores.
- pkgver = V0.1.0.r9.g6b569d7
- pkgrel = 1
+ pkgver = 0.1.0.r9.g6b569d7
+ pkgrel = 2
url = https://github.com/yzhao062/combo
arch = any
license = BSD
@@ -14,8 +14,9 @@ pkgbase = python-combo-git
depends = python-numba
depends = python-scipy
depends = python-scikit-learn
- provides = python-combo-git
- source = git://github.com/yzhao062/combo.git
+ provides = python-combo
+ conflicts = python-combo
+ source = git+https://github.com/yzhao062/combo.git
md5sums = SKIP
pkgname = python-combo-git
diff --git a/PKGBUILD b/PKGBUILD
index 578677d95ca4..525cb62ca63b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,32 @@
# Maintainer: Paul Irofti <paul@irofti.net>
pkgname="python-combo-git"
-pkgver=V0.1.0.r9.g6b569d7
-pkgrel=1
+pkgver=0.1.0.r9.g6b569d7
+pkgrel=2
pkgdesc="Python toolbox for combining machine learning (ML) models and scores."
url="https://github.com/yzhao062/combo"
depends=('python' 'python-joblib' 'python-matplotlib' 'python-numpy'
'python-numba' 'python-scipy' 'python-scikit-learn')
makedepends=('git' 'cython')
-provides=('python-combo-git')
+provides=('python-combo')
+conflicts=('python-combo')
arch=('any')
license=('BSD')
-source=("git://github.com/yzhao062/combo.git")
+source=("git+https://github.com/yzhao062/combo.git")
md5sums=('SKIP')
pkgver() {
- cd "$srcdir/combo"
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ cd "combo"
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^V//'
}
build() {
- cd "$srcdir/combo"
+ cd "combo"
python setup.py build
}
package() {
- cd "$srcdir/combo"
- python setup.py install --root=${pkgdir} --optimize=1 --skip-build
+ cd "combo"
+ python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
# vim:ts=2:sw=2:et: