ci: Try to fix cache failures when running GH actions (#3604)

* ci: Try to fix cache failures when running GH actions * Update lockfile * Fix test * Fix? * Update test --------- Co-authored-by: Patrick Arminio <[email protected]>
strawberry-graphql · Aug 30, 2024 · 26fa597 · 26fa597
1 parent cafc388
commit 26fa597
Show file tree

Hide file tree

Showing 8 changed files with 913 additions and 1,010 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -67,10 +67,12 @@ jobs:
             ~/.nox
             .nox
           key:
-            ${{ runner.os }}-nox-${{ matrix.session.session }}-${{
-            hashFiles('**/poetry.lock') }}-${{ hashFiles('**/noxfile.py') }}-4
+            ${{ runner.os }}-nox-${{ matrix.session.session }}-${{ env.pythonLocation }}-${{
+            hashFiles('**/poetry.lock') }}-${{ hashFiles('**/noxfile.py') }}
+          restore-keys: |
+            ${{ runner.os }}-nox-${{ matrix.session.session }}-${{ env.pythonLocation }}
 
-      - run: pip install poetry nox nox-poetry
+      - run: pip install poetry nox nox-poetry uv
       - run: nox -r -t tests -s "${{ matrix.session.session }}"
       - uses: actions/upload-artifact@v4
         if: ${{ always() }}
@@ -94,8 +96,6 @@ jobs:
   benchmarks:
     name: 📈 Benchmarks
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
 
     steps:
       - uses: actions/checkout@v4
@@ -120,8 +120,6 @@ jobs:
   lint:
     name: ✨ Lint
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
 
     steps:
       - uses: actions/checkout@v4
@@ -143,14 +141,12 @@ jobs:
             ~/.nox
             .nox
           key:
-            ${{ runner.os }}-nox-lint-${{ matrix.session.session }}-${{
+            ${{ runner.os }}-nox-lint-${{ env.pythonLocation }}-${{
             hashFiles('**/poetry.lock') }}-${{ hashFiles('**/noxfile.py') }}
           restore-keys: |
-            ${{ runner.os }}-lint-nox-${{ matrix.session.session }}-
-            ${{ runner.os }}-lint-nox-
+            ${{ runner.os }}-nox-lint-${{ env.pythonLocation }}
 
-      - run: pip install poetry
-      - run: pip install nox nox-poetry
+      - run: pip install poetry nox nox-poetry uv
       - run: nox -r -t lint
 
   unit-tests-on-windows:

diff --git a/noxfile.py b/noxfile.py
@@ -6,6 +6,7 @@
 
 nox.options.reuse_existing_virtualenvs = True
 nox.options.error_on_external_run = True
+nox.options.default_venv_backend = "uv"
 
 PYTHON_VERSIONS = ["3.12", "3.11", "3.10", "3.9", "3.8"]
 GQL_CORE_VERSIONS = [

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -70,7 +70,7 @@ email-validator = {version = ">=1.1.3,<3.0.0", optional = false}
 freezegun = "^1.2.1"
 libcst = {version = ">=1.0.0", optional = false}
 MarkupSafe = "2.1.3"
-nox = "^2023.4.22"
+nox = "^2024.4.15"
 nox-poetry = "^1.0.3"
 opentelemetry-api = "<2"
 opentelemetry-sdk = "<2"

diff --git a/strawberry/aiohttp/views.py b/strawberry/aiohttp/views.py
@@ -15,6 +15,7 @@
 )
 
 from aiohttp import web
+from aiohttp.multipart import BodyPartReader
 from strawberry.aiohttp.handlers import (
     GraphQLTransportWSHandler,
     GraphQLWSHandler,
@@ -60,6 +61,7 @@ async def get_form_data(self) -> FormData:
         files: Dict[str, Any] = {}
 
         async for field in reader:
+            assert isinstance(field, BodyPartReader)
             assert field.name
 
             if field.filename:

diff --git a/tests/typecheckers/test_fields_resolver_async.py b/tests/typecheckers/test_fields_resolver_async.py
@@ -34,10 +34,10 @@ def test():
         [
             Result(
                 type="error",
-                message="""\
-Expression of type "int" is incompatible with declared type "str"
-\xa0\xa0"int" is incompatible with "str"\
-""",
+                message=(
+                    'Type "int" is not assignable to declared type "str"\n'
+                    '\xa0\xa0"int" is not assignable to "str"'
+                ),
                 line=12,
                 column=22,
             ),

diff --git a/tests/websockets/test_graphql_transport_ws.py b/tests/websockets/test_graphql_transport_ws.py
@@ -42,8 +42,8 @@ async def ws_raw(http_client: HttpClient) -> AsyncGenerator[WebSocketClient, Non
         "/graphql", protocols=[GRAPHQL_TRANSPORT_WS_PROTOCOL]
     ) as ws:
         yield ws
-    await ws.close()
-    assert ws.closed
+        await ws.close()
+        assert ws.closed
 
 
 @pytest_asyncio.fixture

diff --git a/tests/websockets/test_graphql_ws.py b/tests/websockets/test_graphql_ws.py
@@ -30,8 +30,8 @@ async def ws_raw(http_client: HttpClient) -> AsyncGenerator[WebSocketClient, Non
         "/graphql", protocols=[GRAPHQL_WS_PROTOCOL]
     ) as ws:
         yield ws
-    await ws.close()
-    assert ws.closed
+        await ws.close()
+        assert ws.closed
 
 
 @pytest_asyncio.fixture