Merge pull request #486 from Pylons/update-runners-to-uvx

Update runners to uvx

Author: digitalresistor

.github/workflows/ci-tests.yml

@@ -14,119 +14,72 @@ on:
 jobs:
     test:
         strategy:
+            # See https://github.com/actions/runner-images
             matrix:
                 py:
-                    - "3.9"
                     - "3.10"
                     - "3.11"
                     - "3.12"
                     - "3.13"
-                    - "pypy-3.9"
+                    - "3.14"
                     - "pypy-3.10"
-                    # Pre-release
                 os:
-                    - "ubuntu-22.04"
-                    - "windows-latest"
-                    - "macos-14" # arm64
-                    - "macos-13" # x64
-                architecture:
-                    - x64
-                    - x86
-                    - arm64
+                    - "ubuntu-24.04" # x64
+                    - "windows-2022" # x64
+                    - "macos-15" # arm64
+                    - "macos-15-intel" # x64
                 include:
-                    - py: "pypy-3.9"
-                      toxenv: "pypy39"
+                    - os: "ubuntu-24.04"
+                      pytest-args: "--cov"
                     - py: "pypy-3.10"
                       toxenv: "pypy310"
-                exclude:
-                    # Ubuntu does not have x86/arm64 Python
-                    - os: "ubuntu-22.04"
-                      architecture: x86
-                    - os: "ubuntu-22.04"
-                      architecture: arm64
-                    # MacOS we need to make sure to remove x86 on all
-                    # We need to run no arm64 on macos-13 (Intel), but some
-                    # Python versions: 3.9/3.10
-                    #
-                    # From 3.11 onward, there is support for running x64 and
-                    # arm64 on Apple Silicon based systems (macos-14)
-                    - os: "macos-13"
-                      architecture: x86
-                    - os: "macos-13"
-                      architecture: arm64
-                    - os: "macos-14"
-                      architecture: x86
-                    - os: "macos-14"
-                      architecture: x64
-                      py: "3.9"
-                    - os: "macos-14"
-                      architecture: x64
-                      py: "3.10"
-                    # Windows does not have arm64 releases
-                    - os: "windows-latest"
-                      architecture: arm64
-                    # Don't run all PyPy versions except latest on
-                    # Windows/macOS. They are expensive to run.
-                    - os: "windows-latest"
-                      py: "pypy-3.9"
-                    - os: "macos-13"
-                      py: "pypy-3.9"
-                    - os: "macos-14"
-                      py: "pypy-3.9"
+                      pytest-args: ""
 
-        name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"
+        name: "Python: ${{ matrix.py }} on ${{ matrix.os }}"
         runs-on: ${{ matrix.os }}
         steps:
-            - uses: actions/checkout@v4
-            - name: Setup python
-              uses: actions/setup-python@v5
+            - uses: actions/checkout@v6
+            - name: Setup uv
+              uses: astral-sh/setup-uv@v7
               with:
                   python-version: ${{ matrix.py }}
-                  architecture: ${{ matrix.architecture }}
-            - run: pip install tox
             - name: Running tox with specific toxenv
               if: ${{ matrix.toxenv != '' }}
               env:
                 TOXENV: ${{ matrix.toxenv }}
-              run: tox
+              run: uvx tox
             - name: Running tox for current python version
               if: ${{ matrix.toxenv == '' }}
-              run: tox -e py
+              run: uvx tox -e py -- ${{ matrix.pytest-args }}
 
     coverage:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         name: Validate coverage
         steps:
-            - uses: actions/checkout@v4
-            - name: Setup python
-              uses: actions/setup-python@v5
+            - uses: actions/checkout@v6
+            - name: Setup uv
+              uses: astral-sh/setup-uv@v7
               with:
-                  python-version: "3.13"
-                  architecture: x64
-
-            - run: pip install tox
-            - run: tox -e py313,coverage
+                  python-version: "3.14"
+            - run: uvx tox -e py314,coverage
     docs:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         name: Build the documentation
         steps:
-            - uses: actions/checkout@v4
-            - name: Setup python
-              uses: actions/setup-python@v5
+            - uses: actions/checkout@v6
+            - name: Setup uv
+              uses: astral-sh/setup-uv@v7
               with:
-                  python-version: "3.13"
-                  architecture: x64
-            - run: pip install tox
-            - run: tox -e docs
+                  python-version: "3.14"
+            - run: uvx tox -e docs
     lint:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         name: Lint the package
         steps:
-            - uses: actions/checkout@v4
-            - name: Setup python
-              uses: actions/setup-python@v5
+            - uses: actions/checkout@v6
+            - name: Setup uv
+              uses: astral-sh/setup-uv@v7
               with:
-                  python-version: "3.13"
-                  architecture: x64
-            - run: pip install tox
-            - run: tox -e lint
+                  python-version: "3.14"
+            - run: uvx tox -e lint
+

CHANGES.txt

@@ -21,6 +21,10 @@ Feature
 
 - Add support for Python 3.12.
 
+- Add support for Python 3.13.
+
+- Add support for Python 3.14.
+
 - Add Request.remote_host, exposing REMOTE_HOST environment variable.
 
 - Added ``acceptparse.Accept.parse_offer`` to codify what types of offers
@@ -38,7 +42,7 @@ Compatibility
 Backwards Incompatibilities
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- Drop support for Python 2.7, 3.4, 3.5, 3.6, and 3.7.
+- Drop support for Python 2.7, 3.4, 3.5, 3.6, 3.7, 3.8 and 3.9
 
 Experimental Features
 ~~~~~~~~~~~~~~~~~~~~~

docs/conf.py

@@ -1,7 +1,7 @@
-import pkg_resources
 import sys
 import os
 import shlex
+import importlib.metadata as metadata
 
 extensions = [
     "sphinx.ext.autodoc",
@@ -27,7 +27,7 @@
 copyright = "2018, Ian Bicking, Pylons Project and contributors"
 author = "Ian Bicking, Pylons Project, and contributors"
 
-version = release = pkg_resources.get_distribution("webob").version
+version = release = metadata.version("webob")
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

src/webob/exc.py

@@ -238,23 +238,18 @@ class WSGIHTTPException(Response, HTTPException):
     code = 500
     title = "Internal Server Error"
     explanation = ""
-    body_template_obj = Template(
-        """\
+    body_template_obj = Template("""\
 ${explanation}<br /><br />
 ${detail}
 ${html_comment}
-"""
-    )
+""")
 
-    plain_template_obj = Template(
-        """\
+    plain_template_obj = Template("""\
 ${status}
 
-${body}"""
-    )
+${body}""")
 
-    html_template_obj = Template(
-        """\
+    html_template_obj = Template("""\
 <html>
  <head>
   <title>${status}</title>
@@ -263,8 +258,7 @@ class WSGIHTTPException(Response, HTTPException):
   <h1>${status}</h1>
   ${body}
  </body>
-</html>"""
-    )
+</html>""")
 
     # Set this to True for responses that should have no request body
     empty_body = False
@@ -543,13 +537,11 @@ class _HTTPMove(HTTPRedirection):
     """
 
     explanation = "The resource has been moved to"
-    body_template_obj = Template(
-        """\
+    body_template_obj = Template("""\
 ${explanation} <a href="${location}">${location}</a>;
 you should be redirected automatically.
 ${detail}
-${html_comment}"""
-    )
+${html_comment}""")
 
     def __init__(
         self,
@@ -820,11 +812,9 @@ class HTTPMethodNotAllowed(HTTPClientError):
     code = 405
     title = "Method Not Allowed"
     # override template since we need an environment variable
-    body_template_obj = Template(
-        """\
+    body_template_obj = Template("""\
 The method ${REQUEST_METHOD} is not allowed for this resource. <br /><br />
-${detail}"""
-    )
+${detail}""")
 
 
 class HTTPNotAcceptable(HTTPClientError):
@@ -842,12 +832,10 @@ class HTTPNotAcceptable(HTTPClientError):
     code = 406
     title = "Not Acceptable"
     # override template since we need an environment variable
-    body_template_obj = Template(
-        """\
+    body_template_obj = Template("""\
 The resource could not be generated that was acceptable to your browser
 (content of type ${HTTP_ACCEPT}. <br /><br />
-${detail}"""
-    )
+${detail}""")
 
 
 class HTTPProxyAuthenticationRequired(HTTPClientError):
@@ -991,12 +979,10 @@ class HTTPUnsupportedMediaType(HTTPClientError):
     code = 415
     title = "Unsupported Media Type"
     # override template since we need an environment variable
-    body_template_obj = Template(
-        """\
+    body_template_obj = Template("""\
 The request media type ${CONTENT_TYPE} is not supported by this server.
 <br /><br />
-${detail}"""
-    )
+${detail}""")
 
 
 class HTTPRequestRangeNotSatisfiable(HTTPClientError):
@@ -1199,11 +1185,9 @@ class HTTPNotImplemented(HTTPServerError):
 
     code = 501
     title = "Not Implemented"
-    body_template_obj = Template(
-        """
+    body_template_obj = Template("""
 The request method ${REQUEST_METHOD} is not implemented for this server. <br /><br />
-${detail}"""
-    )
+${detail}""")
 
 
 class HTTPBadGateway(HTTPServerError):

src/webob/multidict.py

@@ -4,6 +4,7 @@
 """
 Gives a multi-value dictionary object (MultiDict) plus several wrappers
 """
+
 import binascii
 from collections.abc import MutableMapping
 from urllib.parse import urlencode as url_encode

src/webob/response.py

@@ -351,7 +351,7 @@ def from_file(cls, fp):
             _http = b"HTTP/"
 
         if status.startswith(_http):
-            (http_ver, status_num, status_text) = status.split(None, 2)
+            http_ver, status_num, status_text = status.split(None, 2)
             status = f"{text_(status_num)} {text_(status_text)}"
 
         while 1:

tests/test_client_functional.py

@@ -68,7 +68,6 @@ def cookie_app(req):
     resp = Response("test")
     resp.headers.add("Set-Cookie", "a=b")
     resp.headers.add("Set-Cookie", "c=d")
-    resp.headerlist.append(("X-Crazy", "value\r\n  continuation"))
     return resp
 
 
@@ -78,9 +77,6 @@ def test_client_cookies(serve, client_app=None):
         req = Request.blank(server.url + "/?test")
         resp = req.send(client_app)
         assert resp.headers.getall("Set-Cookie") == ["a=b", "c=d"]
-        assert resp.headers["X-Crazy"] == "value, continuation", repr(
-            resp.headers["X-Crazy"]
-        )
 
 
 @wsgify

tests/test_in_wsgiref.py

@@ -1,4 +1,5 @@
 import cgi
+from io import DEFAULT_BUFFER_SIZE
 import logging
 import socket
 import sys
@@ -13,6 +14,8 @@
 
 log = logging.getLogger(__name__)
 
+TARGET_CL = DEFAULT_BUFFER_SIZE * 2
+
 
 @pytest.mark.usefixtures("serve")
 def test_request_reading(serve):
@@ -64,7 +67,7 @@ def test_interrupted_request(serve):
 
 
 def _test_app_req_interrupt(env, sr):
-    target_cl = 100000
+    target_cl = TARGET_CL
     try:
         req = Request(env)
         cl = req.content_length
@@ -94,7 +97,7 @@ def _req_int_cgi(req):
 def _req_int_readline(req):
     try:
         assert req.body_file.readline() == b"a=b\n"
-    except OSError:
+    except OSError as exc:
         # too early to detect disconnect
         raise AssertionError("False disconnect alert")
     req.body_file.readline()
@@ -126,7 +129,7 @@ def _send_interrupted_req(server, path="/"):
 _interrupted_req = (
     "POST %s HTTP/1.0\r\n"
     "content-type: application/x-www-form-urlencoded\r\n"
-    "content-length: 100000\r\n"
+    f"content-length: {TARGET_CL}\r\n"
     "\r\n"
 )
-_interrupted_req += "a=b\nz=" + "x" * 10000
+_interrupted_req += "a=b\nz=" + "x" * DEFAULT_BUFFER_SIZE

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
     lint,
-    py39,py310,py311,py312,py313,pypy39,pypy310,
+    py310,py311,py312,py313,py314,pypy39,pypy310,
     coverage,
     docs,
 isolated_build = True