switch to PEP 621

.coveragerc

@@ -2,7 +2,6 @@
 branch=True
 source=trio
 omit=
-  setup.py
 # These are run in subprocesses, but still don't work. We follow
 # coverage's documentation to no avail.
   */trio/_core/_tests/test_multierror_scripts/*

.github/workflows/autodeps.yml

@@ -34,7 +34,7 @@ jobs:
           # The new dependencies may contain a new black version.
           # Commit any changes immediately.
           python -m pip install -r test-requirements.txt
-          black setup.py trio
+          black trio
       - name: Commit changes and create automerge PR
         env:
           GH_TOKEN: ${{ github.token }}

setup.py → LONG_DESCRIPTION.rst

@@ -1,11 +1,3 @@
-from setuptools import find_packages, setup
-
-__version__ = "0.0.0"  # Overwritten from _version.py below, needed for linter to identify that this variable is defined.
-
-with open("trio/_version.py", encoding="utf-8") as version_code:
-    exec(version_code.read())
-
-LONG_DESC = """\
 .. image:: https://raw.githubusercontent.com/python-trio/trio/9b0bec646a31e0d0f67b8b6ecc6939726faf3e17/logo/logo-with-background.svg
    :width: 200px
    :align: right
@@ -47,7 +39,7 @@
 Vital statistics:
 
 * Supported environments: Linux, macOS, or Windows running some kind of Python
-  3.8-or-better (either CPython or PyPy3 is fine). \\*BSD and illumos likely
+  3.8-or-better (either CPython or PyPy3 is fine). \*BSD and illumos likely
   work too, but are not tested.
 
 * Install: ``python3 -m pip install -U trio`` (or on Windows, maybe
@@ -71,61 +63,3 @@
   conduct
   <https://trio.readthedocs.io/en/latest/code-of-conduct.html>`_
   in all project spaces.
-"""
-
-setup(
-    name="trio",
-    version=__version__,
-    description="A friendly Python library for async concurrency and I/O",
-    long_description=LONG_DESC,
-    long_description_content_type="text/x-rst",
-    author="Nathaniel J. Smith",
-    author_email="[email protected]",
-    url="https://github.com/python-trio/trio",
-    license="MIT OR Apache-2.0",
-    packages=find_packages(),
-    install_requires=[
-        # attrs 19.2.0 adds `eq` option to decorators
-        # attrs 20.1.0 adds @frozen
-        "attrs >= 20.1.0",
-        "sortedcontainers",
-        "idna",
-        "outcome",
-        "sniffio >= 1.3.0",
-        # cffi 1.12 adds from_buffer(require_writable=True) and ffi.release()
-        # cffi 1.14 fixes memory leak inside ffi.getwinerror()
-        # cffi is required on Windows, except on PyPy where it is built-in
-        "cffi>=1.14; os_name == 'nt' and implementation_name != 'pypy'",
-        "exceptiongroup >= 1.0.0rc9; python_version < '3.11'",
-    ],
-    # This means, just install *everything* you see under trio/, even if it
-    # doesn't look like a source file, so long as it appears in MANIFEST.in:
-    include_package_data=True,
-    python_requires=">=3.8",
-    keywords=["async", "io", "networking", "trio"],
-    classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Framework :: Trio",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: POSIX :: Linux",
-        "Operating System :: MacOS :: MacOS X",
-        "Operating System :: POSIX :: BSD",
-        "Operating System :: Microsoft :: Windows",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
-        "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",
-        "Topic :: System :: Networking",
-        "Typing :: Typed",
-    ],
-    project_urls={
-        "Documentation": "https://trio.readthedocs.io/",
-        "Changelog": "https://trio.readthedocs.io/en/latest/history.html",
-    },
-)

MANIFEST.in

@@ -1,5 +1,6 @@
 include LICENSE LICENSE.MIT LICENSE.APACHE2
 include README.rst
+include LONG_DESCRIPTION.rst
 include CODE_OF_CONDUCT.md CONTRIBUTING.md
 include test-requirements.txt
 include trio/py.typed

check.sh

@@ -23,10 +23,10 @@ echo "::endgroup::"
 # autoflake --recursive --in-place .
 # pyupgrade --py3-plus $(find . -name "*.py")
 echo "::group::Black"
-if ! black --check setup.py trio; then
+if ! black --check trio; then
     echo "* Black found issues" >> "$GITHUB_STEP_SUMMARY"
     EXIT_STATUS=1
-    black --diff setup.py trio
+    black --diff trio
     echo "::endgroup::"
     echo "::error:: Black found issues"
 else
@@ -118,8 +118,8 @@ Problems were found by static analysis (listed above).
 To fix formatting and see remaining errors, run
 
     pip install -r test-requirements.txt
-    black setup.py trio
-    isort setup.py trio
+    black trio
+    isort trio
     ./check.sh
 
 in your local checkout.

ci.sh

@@ -37,11 +37,11 @@ python -c "import sys, struct, ssl; print('python:', sys.version); print('versio
 echo "::endgroup::"
 
 echo "::group::Install dependencies"
-python -m pip install -U pip setuptools wheel
+python -m pip install -U pip build
 python -m pip --version
 
-python setup.py sdist --formats=zip
-python -m pip install dist/*.zip
+python -m build
+python -m pip install dist/*.whl
 
 if [ "$CHECK_FORMATTING" = "1" ]; then
     python -m pip install -r test-requirements.txt

docs/source/contributing.rst

@@ -133,7 +133,7 @@ in separate sections below:
   adding a test to make sure it stays fixed.
 
 * :ref:`pull-request-formatting`: If you changed Python code, then did
-  you run ``black setup.py trio``? (Or for other packages, replace
+  you run ``black trio``? (Or for other packages, replace
   ``trio`` with the package name.)
 
 * :ref:`pull-request-release-notes`: If your change affects
@@ -316,7 +316,7 @@ you can can add ``# fmt: off`` and ``# fmt: on`` comments.
 
 If you want to see what changes black will make, you can use::
 
-    black --diff setup.py trio
+    black --diff trio
 
 (``--diff`` displays a diff, versus the default mode which fixes files
 in-place.)

docs/source/releasing.rst

@@ -44,7 +44,7 @@ Things to do for releasing:
 * push to PyPI::
 
     git clean -xdf   # maybe run 'git clean -xdn' first to see what it will delete
-    python3 setup.py sdist bdist_wheel
+    python3 -m build
     twine upload dist/*
 
 * update version number in the same pull request

newsfragments/2860.misc.rst

@@ -0,0 +1 @@
+Moved the metadata into :pep:`PEP 621`-compliant :file:`pyproject.toml`.

pyproject.toml

@@ -1,3 +1,76 @@
+[build-system]
+requires = ["setuptools >= 64"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "trio"
+description = "A friendly Python library for async concurrency and I/O"
+authors = [{name = "Nathaniel J. Smith", email = "[email protected]"}]
+license = {text = "MIT OR Apache-2.0"}
+keywords = [
+    "async",
+    "io",
+    "networking",
+    "trio",
+]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Framework :: Trio",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: MacOS :: MacOS X",
+    "Operating System :: POSIX :: BSD",
+    "Operating System :: Microsoft :: Windows",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "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",
+    "Topic :: System :: Networking",
+    "Typing :: Typed",
+]
+requires-python = ">=3.8"
+dependencies = [
+    # attrs 19.2.0 adds `eq` option to decorators
+    # attrs 20.1.0 adds @frozen
+    "attrs >= 20.1.0",
+    "sortedcontainers",
+    "idna",
+    "outcome",
+    "sniffio >= 1.3.0",
+    # cffi 1.12 adds from_buffer(require_writable=True) and ffi.release()
+    # cffi 1.14 fixes memory leak inside ffi.getwinerror()
+    # cffi is required on Windows, except on PyPy where it is built-in
+    "cffi>=1.14; os_name == 'nt' and implementation_name != 'pypy'",
+    "exceptiongroup >= 1.0.0rc9; python_version < '3.11'",
+]
+dynamic = ["version"]
+
+[project.readme]
+file = "LONG_DESCRIPTION.rst"
+content-type = "text/x-rst"
+
+[project.urls]
+Homepage = "https://github.com/python-trio/trio"
+Documentation = "https://trio.readthedocs.io/"
+Changelog = "https://trio.readthedocs.io/en/latest/history.html"
+
+[tool.setuptools]
+# This means, just install *everything* you see under trio/, even if it
+# doesn't look like a source file, so long as it appears in MANIFEST.in:
+include-package-data = true
+
+[tool.setuptools.packages]
+find = {namespaces = false}
+
+[tool.setuptools.dynamic]
+version = {attr = "trio._version.__version__"}
+
 [tool.black]
 target-version = ['py38']
 force-exclude = '''

trio/_core/_tests/test_multierror_scripts/__init__.py

@@ -1,2 +1,3 @@
 # This isn't really a package, everything in here is a standalone script. This
-# __init__.py is just to fool setup.py into actually installing the things.
+# __init__.py is just to fool setuptools' find = {namespaces = false} into
+# actually installing the things.

trio/_version.py

@@ -1,3 +1,3 @@
-# This file is imported from __init__.py and exec'd from setup.py
+# This file is imported from __init__.py and parsed by setuptools
 
 __version__ = "0.23.1+dev"