arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-04-24 15:27:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert "use hatchling instead of flit"

Browse Source 
This reverts commit d18d146d79.
This commit is contained in:
Evgenii Alekseev 2024-10-13 23:04:00 +03:00
parent fca9239cd2
commit 89d8227ba6
3 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -43,7 +43,7 @@ RUN pacman -S --noconfirm --asdeps \
pacman -S --noconfirm --asdeps \ pacman -S --noconfirm --asdeps \
base-devel \ base-devel \
python-build \ python-build \
python-hatchling \ python-flit \
python-installer \ python-installer \
python-wheel \ python-wheel \
&& \ && \

25
package/archlinux/PKGBUILD
View File

@ -8,7 +8,7 @@ arch=('any')
url="https://github.com/arcan1s/ahriman" url="https://github.com/arcan1s/ahriman"
license=('GPL3') license=('GPL3')
depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-bcrypt' 'python-inflection' 'python-pyelftools' 'python-requests') depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-bcrypt' 'python-inflection' 'python-pyelftools' 'python-requests')
makedepends=('python-build' 'python-hatchling' 'python-installer' 'python-wheel') makedepends=('python-build' 'python-flit' 'python-installer' 'python-wheel')
optdepends=('python-aioauth-client: web server with OAuth2 authorization' optdepends=('python-aioauth-client: web server with OAuth2 authorization'
'python-aiohttp: web server' 'python-aiohttp: web server'
'python-aiohttp-apispec>=3.0.0: web server' 'python-aiohttp-apispec>=3.0.0: web server'
@ -32,25 +32,20 @@ backup=('etc/ahriman.ini'
'etc/ahriman.ini.d/logging.ini') 'etc/ahriman.ini.d/logging.ini')
build() { build() {
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"
python -m build --wheel --no-isolation python -m build --wheel --no-isolation
} }
package() { package() {
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"
python -m installer --destdir="$pkgdir" "dist/$pkgname-$pkgver-py3-none-any.whl" python -m installer --destdir="$pkgdir" "dist/$pkgname-$pkgver-py3-none-any.whl"
# hatchling doesn't support installation outside of the python root, so we need to install data files manually # keep usr/share configs as reference and copy them to /etc
local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") install -Dm644 "$pkgdir/usr/share/$pkgname/settings/ahriman.ini" "$pkgdir/etc/ahriman.ini"
cp -a "$pkgdir$site_packages/$pkgname/data/"* "$pkgdir/usr/" install -Dm644 "$pkgdir/usr/share/$pkgname/settings/ahriman.ini.d/logging.ini" "$pkgdir/etc/ahriman.ini.d/logging.ini"
rm -r "$pkgdir$site_packages/$pkgname/data"
# keep usr/share configs as reference and copy them to /etc install -Dm644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
install -Dm644 "$pkgdir/usr/share/$pkgname/settings/ahriman.ini" "$pkgdir/etc/ahriman.ini" install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
install -Dm644 "$pkgdir/usr/share/$pkgname/settings/ahriman.ini.d/logging.ini" "$pkgdir/etc/ahriman.ini.d/logging.ini"
install -Dm644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
} }

19
pyproject.toml
View File

@ -1,6 +1,6 @@
[build-system] [build-system]
requires = ["hatchling"] requires = ["flit_core"]
build-backend = "hatchling.build" build-backend = "flit_core.buildapi"
[project] [project]
name = "ahriman" name = "ahriman"
@ -89,26 +89,17 @@ web = [
"setuptools", # required by aiohttp-apispec "setuptools", # required by aiohttp-apispec
] ]
[tool.hatch.version] [tool.flit.sdist]
path = "src/ahriman/__init__.py"
[tool.hatch.build.targets.sdist]
include = [ include = [
"AUTHORS", "AUTHORS",
"CONTRIBUTING.md", "CONTRIBUTING.md",
"SECURITY.md", "SECURITY.md",
"package", "package",
"src",
"web.png", "web.png",
] ]
exclude = [ exclude = [
"package/archlinux", "package/archlinux",
] ]
[tool.hatch.build.targets.wheel] [tool.flit.external-data]
packages = [ directory = "package"
"src/ahriman",
]
[tool.hatch.build.targets.wheel.force-include]
"package" = "ahriman/data"