Moved the metadata from setup.cfg into PEP 621-compliant pyproject.toml

.readthedocs.yml

@@ -8,6 +8,8 @@ formats:
 python:
   version: 3.7
   install:
+    - method: pip
+      path: .
     - requirements: docs-requirements.txt
 
 sphinx:

check.sh

@@ -13,9 +13,9 @@ python ./trio/_tools/gen_exports.py --test \
 # see https://forum.bors.tech/t/pre-test-and-pre-merge-hooks/322)
 # autoflake --recursive --in-place .
 # pyupgrade --py3-plus $(find . -name "*.py")
-if ! black --check setup.py trio; then
+if ! black --check trio; then
     EXIT_STATUS=1
-    black --diff setup.py trio
+    black --diff trio
 fi
 
 # Run flake8 without pycodestyle and import-related errors
@@ -38,7 +38,7 @@ 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
+    black trio
     ./check.sh
 
 in your local checkout.

ci.sh

@@ -66,11 +66,11 @@ fi
 
 python -c "import sys, struct, ssl; print('#' * 70); print('python:', sys.version); print('version_info:', sys.version_info); print('bits:', struct.calcsize('P') * 8); print('openssl:', ssl.OPENSSL_VERSION, ssl.OPENSSL_VERSION_INFO); print('#' * 70)"
 
-python -m pip install -U pip setuptools wheel
+python -m pip install -U pip hatchling build
 python -m pip --version
 
-python setup.py sdist --formats=zip
-python -m pip install dist/*.zip
+python -m build -nsx .
+python -m pip install dist/*.tar.gz
 
 if [ "$CHECK_FORMATTING" = "1" ]; then
     python -m pip install -r test-requirements.txt

docs-requirements.in

@@ -6,6 +6,7 @@ jinja2 < 3.1
 sphinx_rtd_theme
 sphinxcontrib-trio
 towncrier
+setuptools-scm
 
 # Trio's own dependencies
 cffi; os_name == "nt"

docs-requirements.txt

@@ -59,6 +59,8 @@ pytz==2022.4
     # via babel
 requests==2.28.1
     # via sphinx
+setuptools-scm==7.0.5 
+    # via setuptools-scm
 sniffio==1.3.0
     # via -r docs-requirements.in
 snowballstemmer==2.2.0

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
@@ -292,7 +292,7 @@ sloppy as you like about whitespace; and then before you commit, just
 run::
 
     pip install -U black
-    black setup.py trio
+    black trio
 
 to fix it up. (And don't worry if you forget – when you submit a pull
 request then we'll automatically check and remind you.) Hopefully this
@@ -305,7 +305,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

@@ -21,7 +21,11 @@ Things to do for releasing:
 
    + bump version number
 
-      - increment as per Semantic Versioning rules
+      - increment as per Semantic Versioning rules in
+
+        - in the metadata file (``setup.cfg``)
+
+        - in ``trio/_version.py``
 
       - remove ``+dev`` tag from version number
 
@@ -44,7 +48,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 -ws
     twine upload dist/*
 
 * update version number in the same pull request

newsfragments/2449.feature.rst

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

pyproject.toml

@@ -1,3 +1,66 @@
+[build-system]
+requires = ["hatchling>=1.8.0"]
+build-backend = "hatchling.build"
+#requires = ["setuptools>=61.2", "setuptools_scm[toml]>=3.4.3"]
+#build-backend = "setuptools.build_meta"
+
+[project]
+name = "trio"
+authors = [{name = "Nathaniel J. Smith", email = "[email protected]"}]
+license = {text = "MIT OR Apache-2.0"}
+description = "A friendly Python library for async concurrency and I/O"
+readme = "README.rst"
+keywords = ["async", "io", "networking", "trio"]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "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.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Topic :: System :: Networking",
+    "Framework :: Trio",
+]
+urls = {Homepage = "https://github.com/python-trio/trio"}
+requires-python = ">=3.7"
+dependencies = [
+    "attrs >= 19.2.0",
+    "sortedcontainers",
+    "async_generator >= 1.9",
+    "idna",
+    "outcome",
+    "sniffio",
+    # 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"]
+
+[tool.hatch.version]
+path = "trio/_version.py"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages]
+find = {namespaces = false}
+
+[tool.setuptools_scm]
+write_to = "trio/_version.py"
+write_to_template = "__version__ = \"{version}\"\n"
+
 [tool.black]
 target-version = ['py37']
 

setup.py

@@ -1,119 +1,20 @@
-from setuptools import setup, find_packages
-
-exec(open("trio/_version.py", encoding="utf-8").read())
-
-LONG_DESC = """\
-.. image:: https://raw.githubusercontent.com/python-trio/trio/9b0bec646a31e0d0f67b8b6ecc6939726faf3e17/logo/logo-with-background.svg
-   :width: 200px
-   :align: right
-
-The Trio project's goal is to produce a production-quality, `permissively
-licensed <https://github.com/python-trio/trio/blob/master/LICENSE>`__,
-async/await-native I/O library for Python. Like all async libraries,
-its main purpose is to help you write programs that do **multiple
-things at the same time** with **parallelized I/O**. A web spider that
-wants to fetch lots of pages in parallel, a web server that needs to
-juggle lots of downloads and websocket connections at the same time, a
-process supervisor monitoring multiple subprocesses... that sort of
-thing. Compared to other libraries, Trio attempts to distinguish
-itself with an obsessive focus on **usability** and
-**correctness**. Concurrency is complicated; we try to make it *easy*
-to get things *right*.
-
-Trio was built from the ground up to take advantage of the `latest
-Python features <https://www.python.org/dev/peps/pep-0492/>`__, and
-draws inspiration from `many sources
-<https://github.com/python-trio/trio/wiki/Reading-list>`__, in
-particular Dave Beazley's `Curio <https://curio.readthedocs.io/>`__.
-The resulting design is radically simpler than older competitors like
-`asyncio <https://docs.python.org/3/library/asyncio.html>`__ and
-`Twisted <https://twistedmatrix.com/>`__, yet just as capable. Trio is
-the Python I/O library I always wanted; I find it makes building
-I/O-oriented programs easier, less error-prone, and just plain more
-fun. `Perhaps you'll find the same
-<https://github.com/python-trio/trio/wiki/Testimonials>`__.
-
-This project is young and still somewhat experimental: the overall
-design is solid and the existing features are fully tested and
-documented, but you may encounter missing functionality or rough
-edges. We *do* encourage you do use it, but you should `read and
-subscribe to issue #1
-<https://github.com/python-trio/trio/issues/1>`__ to get warning and a
-chance to give feedback about any compatibility-breaking changes.
-
-Vital statistics:
-
-* Supported environments: Linux, macOS, or Windows running some kind of Python
-  3.7-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
-  ``py -3 -m pip install -U trio``). No compiler needed.
-
-* Tutorial and reference manual: https://trio.readthedocs.io
-
-* Bug tracker and source code: https://github.com/python-trio/trio
-
-* Real-time chat: https://gitter.im/python-trio/general
-
-* Discussion forum: https://trio.discourse.group
-
-* License: MIT or Apache 2, your choice
-
-* Contributor guide: https://trio.readthedocs.io/en/latest/contributing.html
-
-* Code of conduct: Contributors are requested to follow our `code of
-  conduct
-  <https://trio.readthedocs.io/en/latest/code-of-conduct.html>`_
-  in all project spaces.
+import inspect
+import sys
+from warnings import warn
+
+from setuptools import setup
+
+if len(inspect.stack()) == 1:
+    warn(
+        """
+========================================
+Unsupported building/installation method
+========================================
+This version of trio has dropped support for using `python setup.py ...`.
+`setup.py` will be removed in future.
+Please use `python -m build` (or any other PEP 517 build backend) and then install the built wheel with `pip` instead.
 """
+    )
 
-setup(
-    name="trio",
-    version=__version__,
-    description="A friendly Python library for async concurrency and I/O",
-    long_description=LONG_DESC,
-    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",  # for eq
-        "sortedcontainers",
-        "async_generator >= 1.9",
-        "idna",
-        "outcome",
-        "sniffio",
-        # 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.7",
-    keywords=["async", "io", "networking", "trio"],
-    classifiers=[
-        "Development Status :: 3 - Alpha",
-        "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.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Topic :: System :: Networking",
-        "Framework :: Trio",
-    ],
-)
+if __name__ == "__main__":
+    setup()

trio/_core/tests/test_multierror_scripts/__init__.py

@@ -1,2 +1,2 @@
 # 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 the build backend used into actually installing the things.