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:
parent
f26b530859
commit
2a17ba9833
|
|
@ -19,7 +19,7 @@ jobs:
|
|||
pip install build twine
|
||||
- name: Build archinstall
|
||||
run: |
|
||||
python -m build
|
||||
python -m build . --wheel
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: archinstall
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
pip install build twine
|
||||
- name: Build archinstall
|
||||
run: |
|
||||
python -m build
|
||||
python -m build . --wheel
|
||||
- name: Publish archinstall to PyPi
|
||||
env:
|
||||
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
|
||||
|
|
|
|||
3
PKGBUILD
3
PKGBUILD
|
|
@ -12,7 +12,7 @@ arch=(any)
|
|||
url="https://github.com/archlinux/archinstall"
|
||||
license=(GPL3)
|
||||
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)
|
||||
conflicts=(python-archinstall)
|
||||
replaces=(python-archinstall)
|
||||
|
|
@ -29,7 +29,6 @@ validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxe
|
|||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
# use real directories for examples and profiles, as symlinks do not work
|
||||
# with flit or setuptools PEP517 backends
|
||||
rm -fv $pkgname/{examples,profiles}
|
||||
mv -v examples profiles $pkgname/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[build-system]
|
||||
requires = ["flit_core >=3.5.1,<4", "setuptools>=45", "wheel"]
|
||||
build-backend = "flit_core.buildapi"
|
||||
requires = ["setuptools>=67"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "archinstall"
|
||||
|
|
@ -18,6 +18,7 @@ classifiers = [
|
|||
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
|
||||
"Programming Language :: Python :: 3.8",
|
||||
"Programming Language :: Python :: 3.9",
|
||||
"Programming Language :: Python :: 3.10",
|
||||
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
|
||||
"Operating System :: POSIX :: Linux",
|
||||
]
|
||||
|
|
@ -33,14 +34,10 @@ archinstall = "archinstall:run_as_a_module"
|
|||
[project.optional-dependencies]
|
||||
doc = ["sphinx"]
|
||||
|
||||
[tool.flit.sdist]
|
||||
include = ["docs/", "profiles", "examples", "archinstall/profiles", "archinstall/examples"]
|
||||
exclude = ["docs/*.html", "docs/_static", "docs/*.png", "docs/*.psd"]
|
||||
|
||||
[tool.mypy]
|
||||
python_version = "3.10"
|
||||
exclude = "tests"
|
||||
|
||||
[tool.bandit]
|
||||
targets = ["ourkvm"]
|
||||
targets = ["archinstall"]
|
||||
exclude = ["/tests"]
|
||||
|
|
|
|||
16
setup.cfg
16
setup.cfg
|
|
@ -6,6 +6,7 @@ author = Anton Hvornum
|
|||
author_email = anton@hvornum.se
|
||||
long_description = file: README.md
|
||||
long_description_content_type = text/markdown
|
||||
keywords = linux, arch, archinstall, installer
|
||||
license = GPL
|
||||
license_files =
|
||||
LICENSE
|
||||
|
|
@ -13,15 +14,18 @@ project_urls =
|
|||
Source = https://github.com/archlinux/archinstall
|
||||
Documentation = https://archinstall.readthedocs.io/
|
||||
classifiers =
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.8
|
||||
Programming Language :: Python :: 3.9
|
||||
License :: OSI Approved :: GNU General Public License v3 (GPLv3)
|
||||
Operating System :: POSIX :: Linux
|
||||
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
|
||||
"Programming Language :: Python :: 3.8",
|
||||
"Programming Language :: Python :: 3.9",
|
||||
"Programming Language :: Python :: 3.10",
|
||||
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
|
||||
"Operating System :: POSIX :: Linux",
|
||||
|
||||
[options]
|
||||
packages = find:
|
||||
python_requires = >= 3.8
|
||||
python_requires = >= 3.10
|
||||
zip_safe = True
|
||||
include_package_data = True
|
||||
|
||||
[options.packages.find]
|
||||
include =
|
||||
|
|
|
|||
Loading…
Reference in New Issue