Replacing flit (#1655)

* Replacing flit

* Removed python-flit as a dependency

* Removed note about flit

* Removed flit references in pyproject.toml
This commit is contained in:
Anton Hvornum 2023-02-27 23:51:22 +01:00 committed by GitHub
parent f26b530859
commit 2a17ba9833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 18 deletions

View File

@ -19,7 +19,7 @@ jobs:
pip install build twine pip install build twine
- name: Build archinstall - name: Build archinstall
run: | run: |
python -m build python -m build . --wheel
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: archinstall name: archinstall

View File

@ -24,7 +24,7 @@ jobs:
pip install build twine pip install build twine
- name: Build archinstall - name: Build archinstall
run: | run: |
python -m build python -m build . --wheel
- name: Publish archinstall to PyPi - name: Publish archinstall to PyPi
env: env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}

View File

@ -12,7 +12,7 @@ arch=(any)
url="https://github.com/archlinux/archinstall" url="https://github.com/archlinux/archinstall"
license=(GPL3) license=(GPL3)
depends=(python) depends=(python)
makedepends=(python-build python-installer python-flit python-setuptools python-sphinx python-wheel) makedepends=(python-build python-installer python-setuptools python-sphinx python-wheel)
provides=(python-archinstall) provides=(python-archinstall)
conflicts=(python-archinstall) conflicts=(python-archinstall)
replaces=(python-archinstall) replaces=(python-archinstall)
@ -29,7 +29,6 @@ validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxe
prepare() { prepare() {
cd $pkgname-$pkgver cd $pkgname-$pkgver
# use real directories for examples and profiles, as symlinks do not work # use real directories for examples and profiles, as symlinks do not work
# with flit or setuptools PEP517 backends
rm -fv $pkgname/{examples,profiles} rm -fv $pkgname/{examples,profiles}
mv -v examples profiles $pkgname/ mv -v examples profiles $pkgname/
} }

View File

@ -1,6 +1,6 @@
[build-system] [build-system]
requires = ["flit_core >=3.5.1,<4", "setuptools>=45", "wheel"] requires = ["setuptools>=67"]
build-backend = "flit_core.buildapi" build-backend = "setuptools.build_meta"
[project] [project]
name = "archinstall" name = "archinstall"
@ -18,6 +18,7 @@ classifiers = [
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
"Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"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",
] ]
@ -33,14 +34,10 @@ archinstall = "archinstall:run_as_a_module"
[project.optional-dependencies] [project.optional-dependencies]
doc = ["sphinx"] doc = ["sphinx"]
[tool.flit.sdist]
include = ["docs/", "profiles", "examples", "archinstall/profiles", "archinstall/examples"]
exclude = ["docs/*.html", "docs/_static", "docs/*.png", "docs/*.psd"]
[tool.mypy] [tool.mypy]
python_version = "3.10" python_version = "3.10"
exclude = "tests" exclude = "tests"
[tool.bandit] [tool.bandit]
targets = ["ourkvm"] targets = ["archinstall"]
exclude = ["/tests"] exclude = ["/tests"]

View File

@ -6,6 +6,7 @@ author = Anton Hvornum
author_email = anton@hvornum.se author_email = anton@hvornum.se
long_description = file: README.md long_description = file: README.md
long_description_content_type = text/markdown long_description_content_type = text/markdown
keywords = linux, arch, archinstall, installer
license = GPL license = GPL
license_files = license_files =
LICENSE LICENSE
@ -13,15 +14,18 @@ project_urls =
Source = https://github.com/archlinux/archinstall Source = https://github.com/archlinux/archinstall
Documentation = https://archinstall.readthedocs.io/ Documentation = https://archinstall.readthedocs.io/
classifiers = classifiers =
Programming Language :: Python :: 3 "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
Programming Language :: Python :: 3.8 "Programming Language :: Python :: 3.8",
Programming Language :: Python :: 3.9 "Programming Language :: Python :: 3.9",
License :: OSI Approved :: GNU General Public License v3 (GPLv3) "Programming Language :: Python :: 3.10",
Operating System :: POSIX :: Linux "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Operating System :: POSIX :: Linux",
[options] [options]
packages = find: packages = find:
python_requires = >= 3.8 python_requires = >= 3.10
zip_safe = True
include_package_data = True
[options.packages.find] [options.packages.find]
include = include =