From f8a76f95e22bfefd372a18b78c34d8e651e736f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20K=C3=A4ufl?= <django@c.michael-kaeufl.de>
Date: Mon, 23 Dec 2019 18:03:48 +0100
Subject: [PATCH] Change packaging to use setuptools declarative config in
 setup.cfg

---
 setup.cfg | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py  | 48 ++----------------------------------------------
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e50af68..8118aa9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,55 @@
+[metadata]
+name = daphne
+version = attr: daphne.__version__
+url = https://github.com/django/daphne
+author = Django Software Foundation
+author_email = foundation@djangoproject.com
+description = Django ASGI (HTTP/WebSocket) server
+long_description = file: README.rst
+license = BSD
+classifiers =
+    Development Status :: 4 - Beta
+    Environment :: Web Environment
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Topic :: Internet :: WWW/HTTP
+
+[options]
+python_requires = >=3.5
+package_dir =
+    twisted = daphne/twisted
+packages = find_namespace:
+include_package_data = true
+zip_safe = false
+install_requires =
+    twisted[tls] >= 18.7
+    autobahn >= 0.18
+    asgiref ~= 3.2
+setup_requires =
+    pytest-runner
+
+[options.packages.find]
+exclude =
+    tests
+
+[options.entry_points]
+console_scripts =
+    daphne = daphne.cli:CommandLineInterface.entrypoint
+
+[options.extras_require]
+tests =
+    hypothesis == 4.23
+    pytest ~= 3.10
+    pytest-asyncio ~= 0.8
+
 [bdist_wheel]
 universal=1
 
diff --git a/setup.py b/setup.py
index 357e294..6068493 100755
--- a/setup.py
+++ b/setup.py
@@ -1,47 +1,3 @@
-import os
+from setuptools import setup
 
-from setuptools import find_packages, setup
-
-from daphne import __version__
-
-# We use the README as the long_description
-readme_path = os.path.join(os.path.dirname(__file__), "README.rst")
-with open(readme_path) as fp:
-    long_description = fp.read()
-
-setup(
-    name="daphne",
-    version=__version__,
-    url="https://github.com/django/daphne",
-    author="Django Software Foundation",
-    author_email="foundation@djangoproject.com",
-    description="Django ASGI (HTTP/WebSocket) server",
-    long_description=long_description,
-    license="BSD",
-    zip_safe=False,
-    package_dir={"twisted": "daphne/twisted"},
-    packages=find_packages() + ["twisted.plugins"],
-    include_package_data=True,
-    install_requires=["twisted[tls]>=18.7", "autobahn>=0.18", "asgiref~=3.2"],
-    setup_requires=["pytest-runner"],
-    extras_require={
-        "tests": ["hypothesis==4.23", "pytest~=3.10", "pytest-asyncio~=0.8"]
-    },
-    entry_points={
-        "console_scripts": ["daphne = daphne.cli:CommandLineInterface.entrypoint"]
-    },
-    classifiers=[
-        "Development Status :: 4 - Beta",
-        "Environment :: Web Environment",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Topic :: Internet :: WWW/HTTP",
-    ],
-)
+setup()