diff --git a/PKGBUILD b/PKGBUILD index 7860438..3c34279 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ url="https://git.kske.dev/DieGurke/pwgen" license=('GPL') groups=() depends=('binutils' 'python') -makedepends=('git') +makedepends=('git' 'python-build' 'python-installer') checkupdates=() optdepends=('bash') provides=(pwgen) @@ -26,9 +26,14 @@ pkgver() { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +build() { + python -m build --wheel --no-isolation +} + package() { cd ${pkgname} install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm755 pwgen.sh "${pkgdir}/usr/bin/pwgen" + python -m installer --destdir="$pkgdir" dist/*.whl } diff --git a/pwgen.sh b/pwgen.sh index 5d43fff..a6f7f6d 100755 --- a/pwgen.sh +++ b/pwgen.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -imp="import pwgenerator as g;" +imp="from src import pwgenerator as g;" function _help() { echo "Usage: pwgen [length] [mode]" diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..1a30317 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requres = ["setuptools>=42"] +build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py deleted file mode 100644 index b14ccda..0000000 --- a/setup.py +++ /dev/null @@ -1,9 +0,0 @@ -setup( - name='pwgen', - version='1.0', - description='Random Password Generator Module', - author="Maximilian Käfer", - author_email='maxi@kske.dev', - packages=['pwgen'], - install_requires=['wheel'], -) diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pwgenerator.py b/src/pwgenerator.py similarity index 100% rename from pwgenerator.py rename to src/pwgenerator.py