Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLord Anton Hvornum <anton.feeds@gmail.com>2020-11-08 13:22:59 +0100
committerLord Anton Hvornum <anton.feeds@gmail.com>2020-11-08 13:22:59 +0100
commitf5230fcb30998d4d61e860f9d6cabebd164561f3 (patch)
tree9c62d511ed41a9a362b916719b8306d54fdfbec8
parent6b4a242d61f5d7541d711af76082b935512bdbe0 (diff)
Attempting to fix pypi build issues.
-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.py2
6 files changed, 7 insertions, 6 deletions
diff --git a/PKGBUILD/archinstall-bin/PKGBUILD b/PKGBUILD/archinstall-bin/PKGBUILD
index 7ef9fbd6..3f424505 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.6rc3"
+pkgver="2.0.6rc4"
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 28525bdd..8e10ed86 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.6rc3"
+pkgver="2.0.6rc4"
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 d330a3e2..0ea2d5b2 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.6rc3"
+pkgver="2.0.6rc4"
pkgdesc="Installs ${pkgname} as a python library."
pkgrel=1
url="https://github.com/Torxed/archinstall"
diff --git a/VERSION b/VERSION
index 241dc2d8..9c61cb23 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.6rc1
+2.0.6rc4 \ No newline at end of file
diff --git a/make.sh b/make.sh
index 6f645ad2..3346c3f9 100755
--- a/make.sh
+++ b/make.sh
@@ -11,7 +11,8 @@ 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 bdist_wheel
+python3 setup.py sdist make
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 815376b0..7e825129 100644
--- a/setup.py
+++ b/setup.py
@@ -22,5 +22,5 @@ setuptools.setup(
"Operating System :: POSIX :: Linux",
],
python_requires='>=3.8',
- package_data={'archinstall': glob.glob('examples/*.py') + glob.glob('profiles/*.py')},
+ package_data={'archinstall': glob.glob('examples/*.py') + glob.glob('profiles/*.py'), 'VERSION' : 'VERSION'},
)