summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo (XenGi) Band2020-03-06 11:43:42 +0100
committerRicardo (XenGi) Band2020-03-06 11:43:42 +0100
commita12327e51313e1586918511d124bfb762ef49874 (patch)
tree1a90863839c5bf92bcec9bbe749d4ed92e3c9357
parent8975f2d57f7383c1abc9bac32368340b5c66cc5a (diff)
downloadaur-a12327e51313e1586918511d124bfb762ef49874.tar.gz
removed python2 support because of missing package python2-pkgconfig
-rw-r--r--.SRCINFO37
-rw-r--r--PKGBUILD35
-rw-r--r--virtualfish.install2
3 files changed, 27 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 981bb731fc4..128f972e3d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,21 @@
pkgbase = virtualfish
pkgdesc = A virtualenv wrapper for the Fish shell
pkgver = 1.0.6
- pkgrel = 6
+ pkgrel = 8
url = https://github.com/adambrenecki/virtualfish
install = virtualfish.install
arch = any
license = MIT
+ checkdepends = python-pytest>=3.1.3
+ checkdepends = python-pytest-xdist>=1.22.2
makedepends = python-setuptools
- makedepends = python-setuptools-scm
- makedepends = python-virtualenv
- makedepends = python-pkgconfig
- makedepends = python-psutil
- makedepends = python-xdg
- makedepends = python2-setuptools
- makedepends = python2-setuptools-scm
- makedepends = python2-virtualenv
- makedepends = python2-pkgconfig
- makedepends = python2-psutil
- makedepends = python2-xdg
- options = !emptydirs
- source = virtualfish::git+https://github.com/adambrenecki/virtualfish.git#tag=1.0.6
- sha256sums = SKIP
-
-pkgname = python-virtualfish
- depends = python-setuptools
- depends = python-setuptools-scm
+ makedepends = python-setuptools-scm>=1.11.1
depends = python-virtualenv
- depends = python-pkgconfig
- depends = python-psutil
+ depends = python-pkgconfig>=1.2.2
+ depends = python-psutil>=5.2.2
depends = python-xdg
+ source = virtualfish::git+https://github.com/adambrenecki/virtualfish.git#tag=1.0.6
+ sha256sums = SKIP
-pkgname = python2-virtualfish
- depends = python2-setuptools
- depends = python2-setuptools-scm
- depends = python2-virtualenv
- depends = python2-pkgconfig
- depends = python2-psutil
- depends = python2-xdg
+pkgname = virtualfish
diff --git a/PKGBUILD b/PKGBUILD
index c8d0fb68cc3..540d9f96333 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,30 @@
# Maintainer: Ricardo (XenGi) Band <email@ricardo.band>
-pkgbase=virtualfish
-pkgname=('python-virtualfish' 'python2-virtualfish')
+pkgname=virtualfish
pkgver=1.0.6
-pkgrel=6
+pkgrel=8
pkgdesc="A virtualenv wrapper for the Fish shell"
arch=(any)
url="https://github.com/adambrenecki/virtualfish"
license=('MIT')
-options=(!emptydirs)
install=virtualfish.install
-_deps=('setuptools' 'setuptools-scm' 'virtualenv' 'pkgconfig' 'psutil' 'xdg')
-makedepends=("${_deps[@]/#/python-}" "${_deps[@]/#/python2-}")
-source=("${pkgbase}::git+https://github.com/adambrenecki/${pkgbase}.git#tag=${pkgver}")
+makedepends=('python-setuptools' 'python-setuptools-scm>=1.11.1')
+#checkdepends=('python-pytest>=3.1.3' 'python-pytest-xdist>=1.22.2')
+depends=('python-virtualenv' 'python-pkgconfig>=1.2.2' 'python-psutil>=5.2.2' 'python-xdg') # >=1.0.5')
+source=("${pkgname}::git+https://github.com/adambrenecki/${pkgname}.git#tag=${pkgver}")
sha256sums=('SKIP')
-prepare() {
- cp -a "$srcdir/$pkgbase"{,-py2}
-}
+#check() {
+# cd "${srcdir}/${pkgname}"
+# pytest .
+#}
-package_python-virtualfish() {
- depends=("${_deps[@]/#/python-}")
- cd "${srcdir}/${pkgbase}"
- python setup.py install --root="$pkgdir/" --optimize=1
+build() {
+ cd "${srcdir}/${pkgname}"
+ python setup.py build
}
-package_python2-virtualfish() {
- depends=("${_deps[@]/#/python2-}")
- cd "${srcdir}/${pkgbase}-py2"
- python2 setup.py install --root="$pkgdir/" --optimize=1
+package() {
+ cd "${srcdir}/${pkgname}"
+ python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
}
+
diff --git a/virtualfish.install b/virtualfish.install
index d38e5afaaa9..5d31a60b9c3 100644
--- a/virtualfish.install
+++ b/virtualfish.install
@@ -1,3 +1,3 @@
post_install () {
- echo "To use, edit ~/.config/fish/config.fish, adding a line that reads eval (python -m virtualfish)"
+ echo "To use, edit ~/.config/fish/config.fish, adding a line that reads 'eval (python -m virtualfish)'"
}