Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD/archinstall-bin/PKGBUILD2
-rw-r--r--PKGBUILD/archinstall/PKGBUILD2
-rw-r--r--PKGBUILD/python-archinstall/PKGBUILD2
-rw-r--r--VERSION2
-rwxr-xr-xmake.sh3
-rw-r--r--setup.py37
6 files changed, 24 insertions, 24 deletions
diff --git a/PKGBUILD/archinstall-bin/PKGBUILD b/PKGBUILD/archinstall-bin/PKGBUILD
index 3f424505..55e97cf7 100644
--- a/PKGBUILD/archinstall-bin/PKGBUILD
+++ b/PKGBUILD/archinstall-bin/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Anton Hvornum anton@hvornum.se
# Contributor: Anton Hvornum anton@hvornum.se
pkgname="archinstall-bin"
-pkgver="2.0.6rc4"
+pkgver="2.0.6rc7"
pkgdesc="Installs a pre-built binary of ${pkgname}"
pkgrel=1
url="https://github.com/Torxed/archinstall"
diff --git a/PKGBUILD/archinstall/PKGBUILD b/PKGBUILD/archinstall/PKGBUILD
index 8e10ed86..f412f8d2 100644
--- a/PKGBUILD/archinstall/PKGBUILD
+++ b/PKGBUILD/archinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Anton Hvornum <anton@hvornum.se>
# Contributor: demostanis worlds <demostanis@protonmail.com>
pkgname="archinstall"
-pkgver="2.0.6rc4"
+pkgver="2.0.6rc7"
pkgdesc="Installs launcher scripts for archinstall"
pkgrel=1
url="https://github.com/Torxed/archinstall"
diff --git a/PKGBUILD/python-archinstall/PKGBUILD b/PKGBUILD/python-archinstall/PKGBUILD
index 0ea2d5b2..29a8b1a1 100644
--- a/PKGBUILD/python-archinstall/PKGBUILD
+++ b/PKGBUILD/python-archinstall/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: demostanis worlds <demostanis@protonmail.com>
pkgname="python-archinstall"
-pkgver="2.0.6rc4"
+pkgver="2.0.6rc7"
pkgdesc="Installs ${pkgname} as a python library."
pkgrel=1
url="https://github.com/Torxed/archinstall"
diff --git a/VERSION b/VERSION
index 9c61cb23..381041cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.6rc4 \ No newline at end of file
+2.0.6rc7 \ No newline at end of file
diff --git a/make.sh b/make.sh
index 3346c3f9..6f645ad2 100755
--- a/make.sh
+++ b/make.sh
@@ -11,8 +11,7 @@ mv archinstall.dist "archinstall-v${VERSION}-x86_64"
tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64"
# makepkg -f
-# python3 setup.py sdist bdist_wheel
-python3 setup.py sdist make
+python3 setup.py sdist bdist_wheel
echo 'python3 -m twine upload dist/* && rm -rf dist/'
rm -rf archinstall.egg-info/ build/ src/ pkg/ archinstall.build/ "archinstall-v${VERSION}-x86_64/"
diff --git a/setup.py b/setup.py
index 7e825129..b0a08afd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,26 +1,27 @@
import setuptools, glob, shutil
with open("README.md", "r") as fh:
- long_description = fh.read()
+ long_description = fh.read()
with open('VERSION', 'r') as fh:
- VERSION = fh.read()
+ VERSION = fh.read()
setuptools.setup(
- name="archinstall",
- version=VERSION,
- author="Anton Hvornum",
- author_email="anton@hvornum.se",
- description="Arch Linux installer - guided, templates etc.",
- long_description=long_description,
- long_description_content_type="text/markdown",
- url="https://github.com/Torxed/archinstall",
- packages=setuptools.find_packages(),
- classifiers=[
- "Programming Language :: Python :: 3.8",
- "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
- "Operating System :: POSIX :: Linux",
- ],
- python_requires='>=3.8',
- package_data={'archinstall': glob.glob('examples/*.py') + glob.glob('profiles/*.py'), 'VERSION' : 'VERSION'},
+ name="archinstall",
+ version=VERSION,
+ author="Anton Hvornum",
+ author_email="anton@hvornum.se",
+ description="Arch Linux installer - guided, templates etc.",
+ long_description=long_description,
+ long_description_content_type="text/markdown",
+ url="https://github.com/Torxed/archinstall",
+ packages=setuptools.find_packages(),
+ classifiers=[
+ "Programming Language :: Python :: 3.8",
+ "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+ "Operating System :: POSIX :: Linux",
+ ],
+ python_requires='>=3.8',
+ setup_requires=['wheel'],
+ package_data={'archinstall': glob.glob('examples/*.py') + glob.glob('profiles/*.py')},
)