[pre-commit.ci] pre-commit autoupdate (#551)

updates:
- [github.com/psf/black: 24.10.0 → 25.1.0](https://github.com/psf/black/compare/24.10.0...25.1.0)
- [github.com/pycqa/isort: 5.13.2 → 6.0.1](https://github.com/pycqa/isort/compare/5.13.2...6.0.1)
- [github.com/PyCQA/flake8: 7.1.1 → 7.2.0](https://github.com/PyCQA/flake8/compare/7.1.1...7.2.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.flake8

@@ -0,0 +1,11 @@
+[flake8]
+exclude =
+    .venv,
+    .tox,
+    docs,
+    testproject,
+    js_client,
+    .eggs
+
+extend-ignore = E123, E128, E266, E402, W503, E731, W601, B036
+max-line-length = 120

.github/workflows/tests.yml

@@ -5,6 +5,10 @@ on:
     branches:
       - main
   pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
 
 jobs:
   tests:
@@ -16,11 +20,11 @@ jobs:
           - ubuntu
           - windows
         python-version:
-        - "3.8"
         - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
+        - "3.13"
 
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -13,3 +13,4 @@ test_consumer*
 .python-version
 .pytest_cache/
 .vscode
+.coverage

.pre-commit-config.yaml

@@ -1,20 +1,20 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 25.1.0
     hooks:
       - id: black
         language_version: python3
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.2.0
     hooks:
       - id: flake8
         additional_dependencies:

CHANGELOG.txt

@@ -1,3 +1,26 @@
+4.2.0 (to be released)
+------------------
+
+* Added support for Python 3.13.
+
+* Drop support for EOL Python 3.8.
+
+* Removed unused pytest-runner
+
+* Fixed sdist file to ensure it includes all tests
+
+4.1.2 (2024-04-11)
+------------------
+
+* Fixed a setuptools configuration error in 4.1.1.
+
+4.1.1 (2024-04-10)
+------------------
+
+* Fixed a twisted.plugin packaging error in 4.1.0.
+
+  Thanks to sdc50.
+
 4.1.0 (2024-02-10)
 ------------------
 

MANIFEST.in

@@ -1 +1,2 @@
 include LICENSE
+recursive-include tests *.py

README.rst

@@ -108,7 +108,7 @@ should start with a slash, but not end with one; for example::
 Python Support
 --------------
 
-Daphne requires Python 3.8 or later.
+Daphne requires Python 3.9 or later.
 
 
 Contributing

daphne/__init__.py

@@ -1,6 +1,6 @@
 import sys
 
-__version__ = "4.1.0"
+__version__ = "4.1.3"
 
 
 # Windows on Python 3.8+ uses ProactorEventLoop, which is not compatible with

daphne/cli.py

@@ -270,16 +270,16 @@ class CommandLineInterface:
             websocket_connect_timeout=args.websocket_connect_timeout,
             websocket_handshake_timeout=args.websocket_connect_timeout,
             application_close_timeout=args.application_close_timeout,
-            action_logger=AccessLogGenerator(access_log_stream)
+            action_logger=(
-            if access_log_stream
+                AccessLogGenerator(access_log_stream) if access_log_stream else None
-            else None,
+            ),
             root_path=args.root_path,
             verbosity=args.verbosity,
             proxy_forwarded_address_header=self._get_forwarded_host(args=args),
             proxy_forwarded_port_header=self._get_forwarded_port(args=args),
-            proxy_forwarded_proto_header="X-Forwarded-Proto"
+            proxy_forwarded_proto_header=(
-            if args.proxy_headers
+                "X-Forwarded-Proto" if args.proxy_headers else None
-            else None,
+            ),
             server_name=args.server_name,
         )
         self.server.run()

daphne/http_protocol.py

@@ -286,9 +286,11 @@ class WebRequest(http.Request):
                             "path": uri,
                             "status": self.code,
                             "method": self.method.decode("ascii", "replace"),
-                            "client": "%s:%s" % tuple(self.client_addr)
+                            "client": (
+                                "%s:%s" % tuple(self.client_addr)
                                 if self.client_addr
-                            else None,
+                                else None
+                            ),
                             "time_taken": self.duration(),
                             "size": self.sentLength,
                         },

daphne/management/commands/runserver.py

@@ -73,6 +73,18 @@ class Command(RunserverCommand):
                 "seconds (default: 5)"
             ),
         )
+        parser.add_argument(
+            "--nostatic",
+            action="store_false",
+            dest="use_static_handler",
+            help="Tells Django to NOT automatically serve static files at STATIC_URL.",
+        )
+        parser.add_argument(
+            "--insecure",
+            action="store_true",
+            dest="insecure_serving",
+            help="Allows serving static files even if DEBUG is False.",
+        )
 
     def handle(self, *args, **options):
         self.http_timeout = options.get("http_timeout", None)

daphne/testing.py

@@ -158,7 +158,7 @@ class DaphneProcess(multiprocessing.Process):
                 application=application,
                 endpoints=endpoints,
                 signal_handlers=False,
-                **self.kwargs
+                **self.kwargs,
             )
             # Set up a poller to look for the port
             reactor.callLater(0.1, self.resolve_port)

daphne/ws_protocol.py

@@ -115,9 +115,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "connecting",
             {
                 "path": self.request.path,
-                "client": "%s:%s" % tuple(self.client_addr)
+                "client": (
-                if self.client_addr
+                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
-                else None,
+                ),
             },
         )
 
@@ -138,9 +138,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "connected",
             {
                 "path": self.request.path,
-                "client": "%s:%s" % tuple(self.client_addr)
+                "client": (
-                if self.client_addr
+                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
-                else None,
+                ),
             },
         )
 
@@ -175,9 +175,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "disconnected",
             {
                 "path": self.request.path,
-                "client": "%s:%s" % tuple(self.client_addr)
+                "client": (
-                if self.client_addr
+                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
-                else None,
+                ),
             },
         )
 
@@ -242,9 +242,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "rejected",
             {
                 "path": self.request.path,
-                "client": "%s:%s" % tuple(self.client_addr)
+                "client": (
-                if self.client_addr
+                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
-                else None,
+                ),
             },
         )
 

pyproject.toml

@@ -1,3 +1,81 @@
+[project]
+name = "daphne"
+dynamic = ["version"]
+description = "Django ASGI (HTTP/WebSocket) server"
+requires-python = ">=3.9"
+authors = [
+    { name = "Django Software Foundation", email = "foundation@djangoproject.com" },
+]
+
+license = { text = "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.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Topic :: Internet :: WWW/HTTP",
+]
+
+dependencies = ["asgiref>=3.5.2,<4", "autobahn>=22.4.2", "twisted[tls]>=22.4"]
+
+[project.optional-dependencies]
+tests = [
+    "django",
+    "hypothesis",
+    "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+    "black",
+    "tox",
+    "flake8",
+    "flake8-bugbear",
+    "mypy",
+]
+
+[project.urls]
+homepage = "https://github.com/django/daphne"
+documentation = "https://channels.readthedocs.io"
+repository = "https://github.com/django/daphne.git"
+changelog = "https://github.com/django/daphne/blob/main/CHANGELOG.txt"
+issues = "https://github.com/django/daphne/issues"
+
+[project.scripts]
+daphne = "daphne.cli:CommandLineInterface.entrypoint"
+
 [build-system]
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+packages = ["daphne"]
+
+[tool.setuptools.dynamic]
+version = { attr = "daphne.__version__" }
+readme = { file = "README.rst", content-type = "text/x-rst" }
+
+[tool.isort]
+profile = "black"
+
+[tool.pytest]
+testpaths = ["tests"]
+asyncio_mode = "strict"
+filterwarnings = ["ignore::pytest.PytestDeprecationWarning"]
+
+[tool.coverage.run]
+omit = ["tests/*"]
+concurrency = ["multiprocessing"]
+
+[tool.coverage.report]
+show_missing = "true"
+skip_covered = "true"
+
+[tool.coverage.html]
+directory = "reports/coverage_html_report"

setup.cfg

@@ -1,61 +0,0 @@
-[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
-long_description_content_type = text/x-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.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: 3.12
-    Topic :: Internet :: WWW/HTTP
-
-[options]
-package_dir =
-    twisted=daphne/twisted
-packages = find:
-include_package_data = True
-install_requires =
-    asgiref>=3.5.2,<4
-    autobahn>=22.4.2
-    twisted[tls]>=22.4
-python_requires = >=3.8
-setup_requires =
-    pytest-runner
-zip_safe = False
-
-[options.entry_points]
-console_scripts =
-    daphne = daphne.cli:CommandLineInterface.entrypoint
-
-[options.extras_require]
-tests =
-    django
-    hypothesis
-    pytest
-    pytest-asyncio
-
-[flake8]
-exclude = venv/*,tox/*,docs/*,testproject/*,js_client/*,.eggs/*
-extend-ignore = E123, E128, E266, E402, W503, E731, W601, B036
-max-line-length = 120
-
-[isort]
-profile = black
-
-[tool:pytest]
-testpaths = tests
-asyncio_mode = strict

tests/test_http_request.py

@@ -304,12 +304,12 @@ class TestHTTPRequest(DaphneTestCase):
         response = self.run_daphne_raw(
             b"GET /\xc3\xa4\xc3\xb6\xc3\xbc HTTP/1.0\r\n\r\n"
         )
-        self.assertTrue(response.startswith(b"HTTP/1.0 400 Bad Request"))
+        self.assertTrue(b"400 Bad Request" in response)
         # Bad querystring
         response = self.run_daphne_raw(
             b"GET /?\xc3\xa4\xc3\xb6\xc3\xbc HTTP/1.0\r\n\r\n"
         )
-        self.assertTrue(response.startswith(b"HTTP/1.0 400 Bad Request"))
+        self.assertTrue(b"400 Bad Request" in response)
 
     def test_invalid_header_name(self):
         """
@@ -321,4 +321,4 @@ class TestHTTPRequest(DaphneTestCase):
             response = self.run_daphne_raw(
                 f"GET / HTTP/1.0\r\n{header_name}: baz\r\n\r\n".encode("ascii")
             )
-            self.assertTrue(response.startswith(b"HTTP/1.0 400 Bad Request"))
+            self.assertTrue(b"400 Bad Request" in response)

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{38,39,310,311,312}
+    py{39,310,311,312,313}
 
 [testenv]
 extras = tests