Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2023-03-31 18:14:34 +0200
committerGitHub <noreply@github.com>2023-03-31 18:14:34 +0200
commitdc5291f781c8211b535e043fc865f72eb7b70a3f (patch)
tree437734478870b028c1ad8203d92174fbb3fd0ad8
parent1c6b0bae73a02fb91b1670e8527ff2dfb6dc3071 (diff)
Removing legacy build files setup.py and setup.cfg (#1711)
* Removing legacy build and dist files * Bumped requirement for setuptools to deal with dynamic license inclusion * Added dynamic versioning and licensing to pyproject.toml * Clarified the license according to the LICENSE file, GPL-3.0-only
-rw-r--r--pyproject.toml22
-rw-r--r--setup.cfg43
-rw-r--r--setup.py3
3 files changed, 18 insertions, 50 deletions
diff --git a/pyproject.toml b/pyproject.toml
index 3572148..6e0fcb9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,14 +1,15 @@
[build-system]
-requires = ["setuptools>=67"]
+requires = ["setuptools>=67.5"]
build-backend = "setuptools.build_meta"
[project]
name = "archinstall"
-dynamic = ["version", "entry-points", "license"]
+dynamic = ["version", "entry-points"]
description = "Arch Linux installer - guided, templates etc."
authors = [
{name = "Anton Hvornum", email = "anton@hvornum.se"},
]
+license = {text = "GPL-3.0-only"}
readme = "README.md"
requires-python = ">=3.10"
@@ -26,11 +27,24 @@ Home = "https://archlinux.org"
Documentation = "https://archinstall.readthedocs.io/"
Source = "https://github.com/archlinux/archinstall"
+[project.optional-dependencies]
+doc = ["sphinx"]
+
[project.scripts]
archinstall = "archinstall:run_as_a_module"
-[project.optional-dependencies]
-doc = ["sphinx"]
+[tool.setuptools]
+packages = ["archinstall", "profiles", "examples"]
+
+[tool.setuptools.package-data]
+archinstall = [
+ "examples/*.py",
+ "profiles/*.py",
+ "profiles/applications/*.py"
+]
+
+[tool.setuptools.dynamic]
+version = {attr = "archinstall.__version__"}
[tool.mypy]
python_version = "3.10"
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index fd73ff9..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-[metadata]
-name = archinstall
-version = attr: archinstall.__version__
-description = Arch Linux installer - guided, templates etc.
-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
-project_urls =
- Source = https://github.com/archlinux/archinstall
- Documentation = https://archinstall.readthedocs.io/
-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",
-
-[options]
-packages = find:
-python_requires = >= 3.10
-zip_safe = True
-include_package_data = True
-
-[options.packages.find]
-include =
- archinstall
- archinstall.*
-
-[options.package_data]
-archinstall =
- examples/*.py
- profiles/*.py
- profiles/applications/*.py
-
-[options.entry_points]
-console_scripts =
- archinstall = archinstall:run_as_a_module
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 639e443..0000000
--- a/setup.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import setuptools # type: ignore
-
-setuptools.setup(package_data={'archinstall': ['locales/*','locales/*/*','locales/*/*/*']}, include_package_data=True)