RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where python's setuptools didn't like running bdist_wheel. Causing issues upstream on pypi because examples/ and VERSION would be missing for instance.

This commit is contained in:
Lord Anton Hvornum 2020-11-08 14:11:24 +01:00
parent f5230fcb30
commit 667e06c63e
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD/archinstall-bin/PKGBUILD
View File

@ -1,7 +1,7 @@
# Maintainer: Anton Hvornum anton@hvornum.se # Maintainer: Anton Hvornum anton@hvornum.se
# Contributor: Anton Hvornum anton@hvornum.se # Contributor: Anton Hvornum anton@hvornum.se
pkgname="archinstall-bin" pkgname="archinstall-bin"
pkgver="2.0.6rc4" pkgver="2.0.6rc7"
pkgdesc="Installs a pre-built binary of ${pkgname}" pkgdesc="Installs a pre-built binary of ${pkgname}"
pkgrel=1 pkgrel=1
url="https://github.com/Torxed/archinstall" url="https://github.com/Torxed/archinstall"

2
PKGBUILD/archinstall/PKGBUILD
View File

@ -1,7 +1,7 @@
# Maintainer: Anton Hvornum <anton@hvornum.se> # Maintainer: Anton Hvornum <anton@hvornum.se>
# Contributor: demostanis worlds <demostanis@protonmail.com> # Contributor: demostanis worlds <demostanis@protonmail.com>
pkgname="archinstall" pkgname="archinstall"
pkgver="2.0.6rc4" pkgver="2.0.6rc7"
pkgdesc="Installs launcher scripts for archinstall" pkgdesc="Installs launcher scripts for archinstall"
pkgrel=1 pkgrel=1
url="https://github.com/Torxed/archinstall" url="https://github.com/Torxed/archinstall"

2
PKGBUILD/python-archinstall/PKGBUILD
View File

@ -2,7 +2,7 @@
# Contributor: demostanis worlds <demostanis@protonmail.com> # Contributor: demostanis worlds <demostanis@protonmail.com>
pkgname="python-archinstall" pkgname="python-archinstall"
pkgver="2.0.6rc4" pkgver="2.0.6rc7"
pkgdesc="Installs ${pkgname} as a python library." pkgdesc="Installs ${pkgname} as a python library."
pkgrel=1 pkgrel=1
url="https://github.com/Torxed/archinstall" url="https://github.com/Torxed/archinstall"

2
VERSION
View File

@ -1 +1 @@
2.0.6rc4 2.0.6rc7

3
make.sh
View File

@ -11,8 +11,7 @@ mv archinstall.dist "archinstall-v${VERSION}-x86_64"
tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64" tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64"
# makepkg -f # makepkg -f
# python3 setup.py sdist bdist_wheel python3 setup.py sdist bdist_wheel
python3 setup.py sdist make
echo 'python3 -m twine upload dist/* && rm -rf dist/' echo 'python3 -m twine upload dist/* && rm -rf dist/'
rm -rf archinstall.egg-info/ build/ src/ pkg/ archinstall.build/ "archinstall-v${VERSION}-x86_64/" rm -rf archinstall.egg-info/ build/ src/ pkg/ archinstall.build/ "archinstall-v${VERSION}-x86_64/"

37
setup.py
View File

@ -1,26 +1,27 @@
import setuptools, glob, shutil import setuptools, glob, shutil
with open("README.md", "r") as fh: with open("README.md", "r") as fh:
long_description = fh.read() long_description = fh.read()
with open('VERSION', 'r') as fh: with open('VERSION', 'r') as fh:
VERSION = fh.read() VERSION = fh.read()
setuptools.setup( setuptools.setup(
name="archinstall", name="archinstall",
version=VERSION, version=VERSION,
author="Anton Hvornum", author="Anton Hvornum",
author_email="anton@hvornum.se", author_email="anton@hvornum.se",
description="Arch Linux installer - guided, templates etc.", description="Arch Linux installer - guided, templates etc.",
long_description=long_description, long_description=long_description,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
url="https://github.com/Torxed/archinstall", url="https://github.com/Torxed/archinstall",
packages=setuptools.find_packages(), packages=setuptools.find_packages(),
classifiers=[ classifiers=[
"Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.8",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Operating System :: POSIX :: Linux", "Operating System :: POSIX :: Linux",
], ],
python_requires='>=3.8', python_requires='>=3.8',
package_data={'archinstall': glob.glob('examples/*.py') + glob.glob('profiles/*.py'), 'VERSION' : 'VERSION'}, setup_requires=['wheel'],
package_data={'archinstall': glob.glob('examples/*.py') + glob.glob('profiles/*.py')},
) )