Migrate from setup.cfg to pyproject.toml completely

One less file?

Author: alex

.github/workflows/wheel-builder.yml

@@ -14,7 +14,6 @@ on:
     paths:
       - .github/workflows/wheel-builder.yml
       - setup.py
-      - setup.cfg
       - pyproject.toml
       - src/cryptography/__about__.py
 

ci-constraints-requirements.txt

@@ -1,7 +1,7 @@
 # This is named ambigiously, but it's a pip constraints file, named like a
 # requirements file so dependabot will update the pins.
 # It was originally generated with;
-#    pip-compile --extra=docs --extra=docstest --extra=pep8test --extra=test --extra=test-randomorder --extra=tox --resolver=backtracking --strip-extras --unsafe-package=cffi --unsafe-package=pycparser --unsafe-package=setuptools setup.cfg
+#    pip-compile --extra=docs --extra=docstest --extra=pep8test --extra=test --extra=test-randomorder --extra=tox --resolver=backtracking --strip-extras --unsafe-package=cffi --unsafe-package=pycparser --unsafe-package=setuptools pyproject.toml
 # and then manually massaged to add version specifiers to packages whose
 # versions vary by Python version
 
@@ -14,7 +14,7 @@ attrs==22.2.0
 babel==2.11.0
     # via sphinx
 black==22.12.0
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 bleach==5.0.1
     # via readme-renderer
 build==0.10.0
@@ -28,7 +28,7 @@ chardet==5.1.0
 charset-normalizer==3.0.1; python_version >= "3.7"
     # via requests
 check-manifest==0.49
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 click==8.1.3
     # via black
 colorama==0.4.6; python_version >= "3.7"
@@ -53,7 +53,7 @@ filelock==3.9.0; python_version >= "3.7"
     #   tox
     #   virtualenv
 hypothesis==6.63.0; python_version >= "3.7"
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 idna==3.4
     # via requests
 imagesize==1.4.1
@@ -65,7 +65,7 @@ importlib-metadata==6.0.0; python_version >= "3.7"
 iniconfig==2.0.0; python_version >= "3.7"
     # via pytest
 iso8601==1.1.0
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 jaraco-classes==3.2.3
     # via keyring
 jinja2==3.1.2
@@ -81,7 +81,7 @@ mdurl==0.1.2
 more-itertools==9.0.0
     # via jaraco-classes
 mypy==0.991
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 mypy-extensions==0.4.3
     # via
     #   black
@@ -107,12 +107,12 @@ pluggy==1.0.0; python_version >= "3.7"
     #   pytest
     #   tox
 pretend==1.0.9
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 py-cpuinfo==9.0.0
     # via pytest-benchmark
 pyenchant==3.2.2
     # via
-    #   cryptography (setup.cfg)
+    #   cryptography (pyproject.toml)
     #   sphinxcontrib-spelling
 pygments==2.14.0
     # via
@@ -125,29 +125,29 @@ pyproject-hooks==1.0.0
     # via build
 pytest==7.2.1; python_version >= "3.7"
     # via
-    #   cryptography (setup.cfg)
+    #   cryptography (pyproject.toml)
     #   pytest-benchmark
     #   pytest-cov
     #   pytest-randomly
     #   pytest-shard
     #   pytest-subtests
     #   pytest-xdist
 pytest-benchmark==4.0.0; python_version >= "3.7"
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 pytest-cov==4.0.0
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 pytest-randomly==3.12.0
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 pytest-shard==0.1.2
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 pytest-subtests==0.9.0; python_version >= "3.7"
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 pytest-xdist==3.1.0; python_version >= "3.7"
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 pytz==2022.7.1
     # via
     #   babel
-    #   cryptography (setup.cfg)
+    #   cryptography (pyproject.toml)
 readme-renderer==37.3
     # via twine
 requests==2.28.2; python_version >= "3.7"
@@ -162,7 +162,7 @@ rfc3986==2.0.0
 rich==13.2.0
     # via twine
 ruff==0.0.230
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 six==1.16.0
     # via bleach
 snowballstemmer==2.2.0
@@ -171,11 +171,11 @@ sortedcontainers==2.4.0
     # via hypothesis
 sphinx==5.3.0
     # via
-    #   cryptography (setup.cfg)
+    #   cryptography (pyproject.toml)
     #   sphinx-rtd-theme
     #   sphinxcontrib-spelling
 sphinx-rtd-theme==1.1.1
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 sphinxcontrib-applehelp==1.0.3
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
@@ -189,7 +189,7 @@ sphinxcontrib-qthelp==1.0.3
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 sphinxcontrib-spelling==7.7.0
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 tomli==2.0.1; python_version >= "3.7"
     # via
     #   black
@@ -202,13 +202,13 @@ tomli==2.0.1; python_version >= "3.7"
     #   pytest
     #   tox
 tox==4.3.5; python_version >= "3.7"
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 twine==4.0.2
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 types-pytz==2022.7.1.0
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 types-requests==2.28.11.8
-    # via cryptography (setup.cfg)
+    # via cryptography (pyproject.toml)
 types-urllib3==1.26.25.4
     # via types-requests
 typing-extensions==4.4.0; python_version >= "3.7"

pyproject.toml

@@ -1,15 +1,97 @@
 [build-system]
 requires = [
-    # The minimum setuptools version is specific to the PEP 517 backend,
-    # and may be stricter than the version required in `setup.cfg`
-    "setuptools>=40.6.0,!=60.9.0",
+    # First version of setuptools to support pyproject.toml configuration
+    "setuptools>=61.0.0",
     "wheel",
-    # Must be kept in sync with the `install_requirements` in `setup.cfg`
+    # Must be kept in sync with `project.dependencies`
     "cffi>=1.12; platform_python_implementation != 'PyPy'",
     "setuptools-rust>=0.11.4",
 ]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "cryptography"
+authors = [
+    {name = "The Python Cryptographic Authority and individual contributors", email = "[email protected]"}
+]
+description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
+license = {text = "(Apache-2.0 OR BSD-3-Clause) AND PSF-2.0"}
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Apache Software License",
+    "License :: OSI Approved :: BSD 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.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "Topic :: Security :: Cryptography",
+]
+requires-python = ">=3.6"
+dependencies = [
+    # Must be kept in sync with `build-system.requires`
+    "cffi >=1.12",
+]
+dynamic = ["version", "readme"]
+
+[project.urls]
+homepage = "https://github.com/pyca/cryptography"
+documentation = "https://cryptography.io/"
+source = "https://github.com/pyca/cryptography/"
+issues = "https://github.com/pyca/cryptography/issues"
+changelog = "https://cryptography.io/en/latest/changelog/"
+
+[tool.setuptools]
+zip-safe = false
+package-dir = {"" = "src"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
+exclude = [
+    "_cffi_src",
+    "_cffi_src.*",
+]
+
+[tool.setuptools.dynamic]
+version = {attr = "cryptography.__version__"}
+readme = {file = "README.rst", content-type = "text/x-rst"}
+
+[project.optional-dependencies]
+ssh = ["bcrypt >=3.1.5"]
+
+# All the following are used for our own testing.
+tox = ["tox"]
+test = [
+    "pytest >=6.2.0",
+    "pytest-shard >=0.1.2",
+    "pytest-benchmark",
+    "pytest-cov",
+    "pytest-subtests",
+    "pytest-xdist",
+    "pretend",
+    "iso8601",
+    "pytz",
+    "hypothesis >=1.11.4, !=3.79.2",
+]
+test-randomorder = ["pytest-randomly"]
+docs = ["sphinx >=5.3.0", "sphinx-rtd-theme >=1.1.1"]
+docstest =  ["pyenchant >=1.6.11", "twine >=1.12.0", "sphinxcontrib-spelling >=4.0.1"]
+sdist = ["setuptools_rust >=0.11.4"]
+pep8test = ["black", "ruff", "mypy", "types-pytz", "types-requests", "check-manifest"]
+
 [tool.black]
 line-length = 79
 target-version = ["py36"]

setup.cfg

@@ -44,7 +44,7 @@
 sys.path.insert(0, src_dir)
 
 try:
-    # See setup.cfg for most of the config metadata.
+    # See pyproject.toml for most of the config metadata.
     setup(
         cffi_modules=[
             "src/_cffi_src/build_openssl.py:ffi",