From 2c897cdcc6d5d0e7ee024c374cdf9c849870e081 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sat, 12 Feb 2022 17:43:22 -0500 Subject: Leverage same build system used by PyPi in the ArchInstall ISO (#973) * Leverage same build system used by PyPi in the ArchInstall ISO * 3.6.0 is not in the archinstall repos yet. Use 3.5.1 so ISOs don't need networking to build. --- .github/workflows/iso-build.yaml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/iso-build.yaml b/.github/workflows/iso-build.yaml index 29178ad8..35016f86 100644 --- a/.github/workflows/iso-build.yaml +++ b/.github/workflows/iso-build.yaml @@ -31,7 +31,7 @@ jobs: - 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" > /tmp/archlive/airootfs/root/.zprofile + - run: echo "pip uninstall archinstall -y; cd archinstall-git; rm -rf dist; python -m build -n; pip install dist/archinstall*.whl" > /tmp/archlive/airootfs/root/.zprofile - run: echo "echo \"This is an unofficial ISO for development and testing of archinstall. No support will be provided.\"" >> /tmp/archlive/airootfs/root/.zprofile - run: echo "echo \"This ISO was built from Git SHA $GITHUB_SHA\"" >> /tmp/archlive/airootfs/root/.zprofile - run: echo "echo \"Type archinstall to launch the installer.\"" >> /tmp/archlive/airootfs/root/.zprofile diff --git a/pyproject.toml b/pyproject.toml index cc73b65e..26244c79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["flit_core >=3.6.0,<4", "setuptools>=45", "wheel"] +requires = ["flit_core >=3.5.1,<4", "setuptools>=45", "wheel"] build-backend = "flit_core.buildapi" [project] -- cgit v1.2.3-70-g09d2