Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use build/install instead of setuptools #319

Merged
merged 8 commits into from
Nov 7, 2023
Merged

fix: use build/install instead of setuptools #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1dca165
Remove commented depends
aminvakil Oct 25, 2023
7a9a7f0
Use gardar branch with python-packaging 23.0 issue fix
aminvakil Oct 28, 2023
2a67c06
Add git to makedepends
aminvakil Oct 28, 2023
0cb3095
Fix srcdir directory
aminvakil Oct 28, 2023
ffafc54
fix: use build/install instead of setuptools
gardar Nov 7, 2023
d4cf2d0
Add gardar as Contributor
aminvakil Nov 7, 2023
9d90e6c
Add new makedepends to .SRCINFO
aminvakil Nov 7, 2023
9ee8260
Nitpicking :)
aminvakil Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ansible-cmdb/.SRCINFO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
pkgbase = ansible-cmdb
pkgdesc = Generate host overview from ansible fact gathering output.
pkgver = 1.31
pkgrel = 1
pkgrel = 2
url = https://github.com/fboender/ansible-cmdb
arch = any
license = GPL3
makedepends = python-setuptools
makedepends = git
makedepends = python-build
makedepends = python-installer
makedepends = python-wheel
depends = python
depends = python-mako
depends = python-pyyaml
source = ansible-cmdb-1.31-1.tar.gz::https://github.com/fboender/ansible-cmdb/archive/1.31.tar.gz
sha256sums = 8de9a02e3f0740967537850f6263756dca1bf506cd95c1f2ef7f4ee6d9ff23b8
source = git+https://github.com/gardar/ansible-cmdb.git#branch=fix-build
sha256sums = SKIP

pkgname = ansible-cmdb
20 changes: 10 additions & 10 deletions ansible-cmdb/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Maintainer: Amin Vakil <info AT aminvakil DOT com>
# Contributor: gardar <aur AT gardar DOT net>

pkgname=ansible-cmdb
pkgver=1.31
pkgrel=1
pkgrel=2
pkgdesc="Generate host overview from ansible fact gathering output."
arch=('any')
url="https://github.com/fboender/ansible-cmdb"
license=('GPL3')
depends=('python' 'python-mako' 'python-pyyaml')
# depends=('python' 'python-mako' 'python-pyyaml' 'python-ushlex' 'python-jsonxs')
makedepends=('python-setuptools')
source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::${url}/archive/${pkgver}.tar.gz")
sha256sums=('8de9a02e3f0740967537850f6263756dca1bf506cd95c1f2ef7f4ee6d9ff23b8')
makedepends=('python-setuptools' 'git' 'python-build' 'python-installer' 'python-wheel')
# source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::${url}/archive/${pkgver}.tar.gz")
source=("git+https://github.com/gardar/ansible-cmdb.git#branch=fix-build")
sha256sums=('SKIP')

build() {
cd "$srcdir/${pkgname}-${pkgver}"
python setup.py build
cd "$srcdir/${pkgname}"
python -m build
}

package() {
cd "$srcdir/${pkgname}-${pkgver}"
PYTHONHASHSEED=0 python setup.py install --root="$pkgdir" --optimize=1
python setup.py install --root="$pkgdir/" --optimize=1
cd "$srcdir/${pkgname}"
python -m installer --destdir="$pkgdir" dist/*.whl
}