Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/python-build.yml4
-rw-r--r--.github/workflows/python-publish.yml2
-rw-r--r--PKGBUILD3
-rw-r--r--pyproject.toml11
-rw-r--r--setup.cfg16
5 files changed, 18 insertions, 18 deletions
diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml
index 4cd32a93..647ad70e 100644
--- a/.github/workflows/python-build.yml
+++ b/.github/workflows/python-build.yml
@@ -19,8 +19,8 @@ jobs:
pip install build twine
- name: Build archinstall
run: |
- python -m build
+ python -m build . --wheel
- uses: actions/upload-artifact@v3
with:
name: archinstall
- path: dist/*
+ path: dist/* \ No newline at end of file
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index dd25a105..8a5bd679 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -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 }}
diff --git a/PKGBUILD b/PKGBUILD
index d8e89ae2..70b18d00 100644
--- a/PKGBUILD
+++ b/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/
}
diff --git a/pyproject.toml b/pyproject.toml
index 207dace5..61f24e37 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -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"]
diff --git a/setup.cfg b/setup.cfg
index 8c9c087e..fd73ff92 100644
--- a/setup.cfg
+++ b/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 =