From 584a2c465fd7446a4a71a8a413668c9a0cb916d5 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Sun, 11 Apr 2021 22:08:29 -0400
Subject: Pull in iso-build.yaml from master to generate a test ISO

---
 .github/workflows/iso-build.yaml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .github/workflows/iso-build.yaml

(limited to '.github/workflows')

diff --git a/.github/workflows/iso-build.yaml b/.github/workflows/iso-build.yaml
new file mode 100644
index 00000000..229a37be
--- /dev/null
+++ b/.github/workflows/iso-build.yaml
@@ -0,0 +1,28 @@
+# This workflow will build an Arch Linux ISO file with the commit on it
+
+name: Build Arch ISO with ArchInstall Commit
+
+on: pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: archlinux:latest
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v2
+    - run: pwd
+    - run: find .
+    - run: cat /etc/os-release
+    - run: mkdir -p /tmp/archlive/airootfs/root/archinstall-git; cp -r . /tmp/archlive/airootfs/root/archinstall-git
+    - run: echo "pip uninstall archinstall -y; cd archinstall-git; python setup.py install; echo 'Type python -m archinstall to launch archinstall'" > /tmp/archlive/airootfs/root/.zprofile
+    - run: pacman -Sy; pacman --noconfirm -S git archiso
+    - run: cp -r /usr/share/archiso/configs/releng/* /tmp/archlive
+    - run: echo -e "git\npython\npython-pip\npython-setuptools" >> /tmp/archlive/packages.x86_64 
+    - run: find /tmp/archlive
+    - run: cd /tmp/archlive;  mkarchiso -v -w work/ -o out/ ./
+    - uses: actions/upload-artifact@v2
+      with:
+        name: Arch Live ISO
+        path: /tmp/archlive/out/*.iso
-- 
cgit v1.2.3-70-g09d2


From 413565dbd0f4d5f5080f96c1d1ecd0c596e1d95b Mon Sep 17 00:00:00 2001
From: advaithm <advaith.madhukar@gmail.com>
Date: Mon, 12 Apr 2021 19:39:23 +0530
Subject: moved to flit build system

---
 .github/workflows/python-publish.yml |  9 ++++-----
 .pypirc                              |  6 ++++++
 archinstall/__init__.py              |  1 +
 pyproject.toml                       | 31 +++++++++++++++++++++++++++++--
 4 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 .pypirc

(limited to '.github/workflows')

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 09bcba55..c24fc0d7 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -21,11 +21,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install setuptools wheel flit
     - name: Build and publish
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        FLIT_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        FLIT_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+        flit publish
diff --git a/.pypirc b/.pypirc
new file mode 100644
index 00000000..7b926de7
--- /dev/null
+++ b/.pypirc
@@ -0,0 +1,6 @@
+[distutils]
+index-servers =
+   pypi
+
+[pypi]
+repository = https://upload.pypi.org/legacy/
\ No newline at end of file
diff --git a/archinstall/__init__.py b/archinstall/__init__.py
index 8a49bef6..0a6e63fd 100644
--- a/archinstall/__init__.py
+++ b/archinstall/__init__.py
@@ -1,3 +1,4 @@
+"""Arch Linux installer - guided, templates etc."""
 from .lib.general import *
 from .lib.disk import *
 from .lib.user_interaction import *
diff --git a/pyproject.toml b/pyproject.toml
index 9787c3bd..330216df 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,30 @@
 [build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["flit_core >=2,<4"]
+build-backend = "flit_core.buildapi"
+
+[tool.flit.metadata]
+module = "archinstall"
+author = "Anton Hvornum"
+author-email = "anton@hvornum.se"
+home-page = "https://archlinux.org"
+classifiers = [ "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+"Programming Language :: Python :: 3.8",
+"Programming Language :: Python :: 3.9",
+"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+"Operating System :: POSIX :: Linux",
+]
+description-file = "README.md"
+requires-python=">=3.8"
+[tool.flit.metadata.urls]
+Source = "https://github.com/archlinux/archinstall"
+Documentation = "https://archinstall.readthedocs.io/"
+
+[tool.flit.scripts]
+archinstall = "archinstall:run_as_a_module"
+
+[tool.flit.sdist]
+include = ["doc/"]
+exclude = ["doc/*.html"]
+
+[tool.flit.metadata.requires-extra]
+doc = ["sphinx"]
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2