From 98e5ce7eae24e99f23fad64974d7d2027df2d5ad Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 18 Apr 2024 15:52:36 -0400 Subject: [PATCH 1/2] Migrated config to pyproject.toml using jaraco.develop.migrate-config and ini2toml. --- pyproject.toml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ setup.cfg | 56 ------------------------------------------- 2 files changed, 65 insertions(+), 56 deletions(-) delete mode 100644 setup.cfg diff --git a/pyproject.toml b/pyproject.toml index 26108523..e4274b4f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,6 +3,71 @@ requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.0"] build-backend = "setuptools.build_meta" +[project] +name = "twine" +authors = [ + { name = "Donald Stufft and individual contributors", email = "donald@stufft.io" }, +] +description = "Collection of utilities for publishing packages on PyPI" +classifiers = [ + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Natural Language :: English", + "Operating System :: MacOS :: MacOS X", + "Operating System :: POSIX", + "Operating System :: POSIX :: BSD", + "Operating System :: POSIX :: Linux", + "Operating System :: Microsoft :: Windows", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: Implementation :: CPython", +] +requires-python = ">=3.8" +dependencies = [ + "pkginfo >= 1.8.1", + "readme-renderer >= 35.0", + "requests >= 2.20", + "requests-toolbelt >= 0.8.0, != 0.9.0", + "urllib3 >= 1.26.0", + "importlib-metadata >= 3.6", + "keyring >= 15.1", + "rfc3986 >= 1.4.0", + "rich >= 12.0.0", +] +dynamic = ["version"] + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[project.urls] +Homepage = "https://twine.readthedocs.io/" +Source = "https://github.com/pypa/twine/" +Documentation = "https://twine.readthedocs.io/en/latest/" +"Packaging tutorial" = "https://packaging.python.org/tutorials/packaging-projects/" + +[project.entry-points."twine.registered_commands"] +check = "twine.commands.check:main" +upload = "twine.commands.upload:main" +register = "twine.commands.register:main" + +[project.scripts] +twine = "twine.__main__:main" + +[tool.setuptools] +packages = [ + "twine", + "twine.commands", +] +include-package-data = true +license-files = ["LICENSE"] + [tool.setuptools_scm] [tool.towncrier] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 4b4908ac..00000000 --- a/setup.cfg +++ /dev/null @@ -1,56 +0,0 @@ -[metadata] -license_files = LICENSE -name = twine -author = Donald Stufft and individual contributors -author_email = donald@stufft.io -description = Collection of utilities for publishing packages on PyPI -long_description = file:README.rst -long_description_content_type = text/x-rst -url = https://twine.readthedocs.io/ -project_urls = - Source = https://github.com/pypa/twine/ - Documentation = https://twine.readthedocs.io/en/latest/ - Packaging tutorial = https://packaging.python.org/tutorials/packaging-projects/ -classifiers = - Intended Audience :: Developers - License :: OSI Approved :: Apache Software License - Natural Language :: English - Operating System :: MacOS :: MacOS X - Operating System :: POSIX - Operating System :: POSIX :: BSD - Operating System :: POSIX :: Linux - Operating System :: Microsoft :: Windows - Programming Language :: Python - Programming Language :: Python :: 3 - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: 3.12 - Programming Language :: Python :: Implementation :: CPython - -[options] -packages = - twine - twine.commands -python_requires = >=3.8 -install_requires= - pkginfo >= 1.8.1 - readme-renderer >= 35.0 - requests >= 2.20 - requests-toolbelt >= 0.8.0, != 0.9.0 - urllib3 >= 1.26.0 - importlib-metadata >= 3.6 - keyring >= 15.1 - rfc3986 >= 1.4.0 - rich >= 12.0.0 -include_package_data = True - -[options.entry_points] -twine.registered_commands = - check = twine.commands.check:main - upload = twine.commands.upload:main - register = twine.commands.register:main -console_scripts = - twine = twine.__main__:main From 7d70217daaa3da48903a78d908c76d27cdc4fdc4 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 18 Apr 2024 15:56:08 -0400 Subject: [PATCH 2/2] Bump setuptools for better support of pyproject.toml. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e4274b4f..b0672016 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ # pyproject.toml [build-system] -requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.0"] +requires = ["setuptools>=61.2", "wheel", "setuptools_scm[toml]>=6.0"] build-backend = "setuptools.build_meta" [project]