diff --git a/pyproject.toml b/pyproject.toml index 512bdbc7d23..78ce491f1aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=64", "wheel"] +requires = ["setuptools>=80", "wheel"] build-backend = "setuptools.build_meta" [project] @@ -12,7 +12,6 @@ classifiers = [ "Framework :: AsyncIO", "Intended Audience :: Developers", "Intended Audience :: End Users/Desktop", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Natural Language :: English", "Operating System :: MacOS :: MacOS X", "Operating System :: Microsoft :: Windows", @@ -24,6 +23,8 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Topic :: Communications :: Chat", ] +license = "GPL-3.0-only" +license-files = ["LICENSE", "redbot/**/*.LICENSE"] dynamic = ["version", "requires-python", "dependencies", "optional-dependencies"] [project.urls] @@ -42,6 +43,9 @@ redbot-setup = "redbot.setup:run_cli" [project.entry-points.pytest11] red-discordbot = "redbot.pytest" +[tool.setuptools.packages.find] +include = ["redbot", "redbot.*"] + [tool.black] line-length = 99 required-version = '23' diff --git a/setup.py b/setup.py index 3ecbf527d9e..02f4a9d1a00 100644 --- a/setup.py +++ b/setup.py @@ -57,8 +57,4 @@ def extras_combined(*extra_names): # TODO: use [tool.setuptools.dynamic] table once this feature gets out of beta install_requires=install_requires, extras_require=extras_require, - # TODO: use [project] table once PEP 639 gets accepted - license_files=["LICENSE", "redbot/**/*.LICENSE"], - # TODO: use [tool.setuptools.packages] table once this feature gets out of beta - packages=find_namespace_packages(include=["redbot", "redbot.*"]), )