diff options
-rw-r--r-- | .SRCINFO | 49 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 47 | ||||
-rw-r--r-- | virtualfish.install | 2 |
4 files changed, 38 insertions, 61 deletions
@@ -1,40 +1,21 @@ pkgbase = virtualfish - pkgdesc = A virtualenv wrapper for the Fish shell - pkgver = 1.0.6 - pkgrel = 5 - url = https://github.com/adambrenecki/virtualfish - install = virtualfish.install + pkgdesc = Fish shell tool for managing Python virtual environments + pkgver = 2.5.8 + pkgrel = 1 + url = https://github.com/justinmayer/virtualfish arch = any license = MIT - 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 - depends = python-virtualenv + makedepends = python-build + makedepends = python-wheel + makedepends = python-installer + makedepends = python-poetry-core + depends = fish + depends = python-packaging depends = python-pkgconfig depends = python-psutil - depends = python-xdg - -pkgname = python2-virtualfish - depends = python2-setuptools - depends = python2-setuptools-scm - depends = python2-virtualenv - depends = python2-pkgconfig - depends = python2-psutil - depends = python2-xdg + depends = python-virtualenv + depends = python-setuptools + source = https://files.pythonhosted.org/packages/source/v/virtualfish/virtualfish-2.5.8.tar.gz + sha256sums = ea887a44399a4b2621b71f15c1d856d54a3ff3348a3292b0dfcb2d8238fe6932 +pkgname = virtualfish diff --git a/.gitignore b/.gitignore index 598a1ed9c50c..9d95720fd614 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ virtualfish/ +xdg.py # Created by https://www.gitignore.io/api/linux,archlinuxpackages,vim @@ -1,31 +1,26 @@ -# Maintainer: Ricardo (XenGi) Band <email@ricardo.band> -pkgbase=virtualfish -pkgname=('python-virtualfish' 'python2-virtualfish') -pkgver=1.0.6 -pkgrel=5 -pkgdesc="A virtualenv wrapper for the Fish shell" -arch=(any) -url="https://github.com/adambrenecki/virtualfish" -license=('MIT') -options=(!emptydirs) -install=virtualfish.install -makedepends=('python-setuptools' 'python-setuptools-scm' 'python-virtualenv' 'python-pkgconfig' 'python-psutil' 'python-xdg' - 'python2-setuptools' 'python2-setuptools-scm' 'python2-virtualenv' 'python2-pkgconfig' 'python2-psutil' 'python2-xdg') -source=("${pkgbase}::git+https://github.com/adambrenecki/${pkgbase}.git#tag=${pkgver}") -sha256sums=('SKIP') +# Maintainer: Ricardo Band <email@ricardo.band> +pkgname=virtualfish +pkgver=2.5.8 +pkgrel=1 +pkgdesc="Fish shell tool for managing Python virtual environments" +arch=("any") +url=https://github.com/justinmayer/virtualfish +license=("MIT") +depends=("fish" "python-packaging" "python-pkgconfig" "python-psutil" "python-virtualenv" "python-setuptools") +makedepends=("python-build" "python-wheel" "python-installer" "python-poetry-core") +source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('ea887a44399a4b2621b71f15c1d856d54a3ff3348a3292b0dfcb2d8238fe6932') -prepare() { - cp -a "$srcdir/$pkgbase"{,-py2} -} +build() { + cd "$srcdir/$pkgname-$pkgver" -package_python-virtualfish() { - depends=('python-setuptools' 'python-setuptools-scm' 'python-virtualenv' 'python-pkgconfig' 'python-psutil' 'python-xdg') - cd "${srcdir}/${pkgbase}" - python setup.py install --root="$pkgdir/" --optimize=1 + python -m build --wheel --no-isolation } -package_python2-virtualfish() { - depends=('python2-setuptools' 'python2-setuptools-scm' 'python2-virtualenv' 'python2-pkgconfig' 'python2-psutil' 'python2-xdg') - cd "${srcdir}/${pkgbase}-py2" - python2 setup.py install --root="$pkgdir/" --optimize=1 +package() { + cd "$srcdir/$pkgname-$pkgver" + + python -m installer --destdir="$pkgdir" dist/*.whl + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + diff --git a/virtualfish.install b/virtualfish.install index d38e5afaaa91..d37b2c009320 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 "Run 'vf install' to install virtualfish" } |