wip

.github/workflows/test.yml

@@ -21,24 +21,25 @@ jobs:
         - '3.11'
         - '3.12'
         - '3.13'
+        - '3.13t'
 
+    env:
+      UV_PYTHON: ${{ matrix.python-version }}
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - uses: astral-sh/setup-uv@v5
       with:
-        python-version: ${{ matrix.python-version }}
-        allow-prereleases: true
+        enable-cache: false
     - name: Install
       run: |
-        python -m venv .venv
-        source .venv/bin/activate
-        pip install maturin
-        maturin develop --extras=test
+        uv python install ${{ env.UV_PYTHON }}
+        uv venv .venv
+        uv pip install maturin
+        uv run --no-sync maturin develop --uv --extras=test
     - name: Test
       run: |
         source .venv/bin/activate
-        py.test -v tests
+        make test
 
   macos:
     runs-on: macos-latest
@@ -51,24 +52,25 @@ jobs:
         - '3.11'
         - '3.12'
         - '3.13'
+        - '3.13t'
 
+    env:
+      UV_PYTHON: ${{ matrix.python-version }}
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - uses: astral-sh/setup-uv@v5
       with:
-        python-version: ${{ matrix.python-version }}
-        allow-prereleases: true
+        enable-cache: false
     - name: Install
       run: |
-        python -m venv .venv
-        source .venv/bin/activate
-        pip install maturin
-        maturin develop --extras=test
+        uv python install ${{ env.UV_PYTHON }}
+        uv venv .venv
+        uv pip install maturin
+        uv run --no-sync maturin develop --uv --extras=test
     - name: Test
       run: |
         source .venv/bin/activate
-        py.test -v tests
+        make test
 
   windows:
     runs-on: windows-latest
@@ -81,21 +83,21 @@ jobs:
         - '3.11'
         - '3.12'
         - '3.13'
+        - '3.13t'
 
+    env:
+      UV_PYTHON: ${{ matrix.python-version }}
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - uses: astral-sh/setup-uv@v5
       with:
-        python-version: ${{ matrix.python-version }}
-        allow-prereleases: true
+        enable-cache: false
     - name: Install
       run: |
-        python -m venv venv
-        venv/Scripts/Activate.ps1
-        pip install maturin
-        maturin develop --extras=test
+        uv python install ${{ env.UV_PYTHON }}
+        uv venv .venv
+        uv pip install maturin
+        uv run --no-sync maturin develop --uv --extras=test
     - name: Test
       run: |
-        venv/Scripts/Activate.ps1
-        py.test -v tests
+        uv run --no-sync py.test -v tests

granian/__init__.py

@@ -1,2 +1,2 @@
 from ._granian import __version__  # noqa: F401
-from .server import Granian as Granian
+from .server import Server as Granian  # noqa: F401

granian/_granian.pyi

@@ -5,6 +5,7 @@ from ._types import WebsocketMessage
 from .http import HTTP1Settings, HTTP2Settings
 
 __version__: str
+BUILD_GIL: bool
 
 class RSGIHeaders:
     def __contains__(self, key: str) -> bool: ...

granian/_internal.py

@@ -41,7 +41,7 @@ def load_module(module_name: str, raise_on_failure: bool = True) -> Optional[Mod
     except ImportError:
         if sys.exc_info()[-1].tb_next:
             raise RuntimeError(
-                f"While importing '{module_name}', an ImportError was raised:" f'\n\n{traceback.format_exc()}'
+                f"While importing '{module_name}', an ImportError was raised:\n\n{traceback.format_exc()}"
             )
         elif raise_on_failure:
             raise RuntimeError(f"Could not import '{module_name}'.")

granian/_loops.py

@@ -71,23 +71,18 @@ def get(self, key: str) -> asyncio.AbstractEventLoop:
 @loops.register('asyncio')
 def build_asyncio_loop():
     loop = asyncio.new_event_loop() if os.name != 'nt' else asyncio.ProactorEventLoop()
-    asyncio.set_event_loop(loop)
     return loop
 
 
 @loops.register('uvloop', packages=['uvloop'])
 def build_uv_loop(uvloop):
-    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
+    loop = uvloop.new_event_loop()
     return loop
 
 
 @loops.register('rloop', packages=['rloop'])
 def build_rloop(rloop):
-    asyncio.set_event_loop_policy(rloop.EventLoopPolicy())
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
+    loop = rloop.new_event_loop()
     return loop
 
 

granian/cli.py

@@ -9,7 +9,7 @@
 from .errors import FatalError
 from .http import HTTP1Settings, HTTP2Settings
 from .log import LogLevels
-from .server import Granian
+from .server import Server
 
 
 _AnyCallable = Callable[..., Any]
@@ -313,7 +313,7 @@ def cli(
                 print('Unable to parse provided logging config.')
                 raise click.exceptions.Exit(1)
 
-    server = Granian(
+    server = Server(
         app,
         address=host,
         port=port,

granian/server/__init__.py

@@ -0,0 +1,7 @@
+from .._granian import BUILD_GIL
+
+
+if BUILD_GIL:
+    from .mp import MPServer as Server
+else:
+    from .mt import MTServer as Server  # noqa: F401