From da0b74f8b0a199318a340407c4ab127558c7ad5e Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Thu, 14 Aug 2025 16:47:59 -0400 Subject: [PATCH 1/7] Use correct python version and allow pre-release versions --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f4322b0..f2e15e89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,9 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + allow-prereleases: true - name: Set up JDK 17 uses: actions/setup-java@v4 From da4a85915511444c360352ad40b1722f1d184c29 Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Thu, 14 Aug 2025 16:54:44 -0400 Subject: [PATCH 2/7] Remove UV_SYSTEM_PYTHON usage --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2e15e89..9bac98bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,6 @@ on: branches: - develop -env: - UV_SYSTEM_PYTHON: true - jobs: ci: runs-on: ubuntu-latest From dd6f1f665dede16537fb2e528e1c7d7383e9de06 Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Thu, 14 Aug 2025 17:01:24 -0400 Subject: [PATCH 3/7] just testing stuff out; this is weird --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bac98bf..4b38b28b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.12", "3.13", "3.14-dev"] + python-version: ["3.12", "3.13", "3.14"] steps: - name: Checkout Repository @@ -40,6 +40,7 @@ jobs: uses: astral-sh/setup-uv@v6 with: activate-environment: true + python-version: ${{ matrix.python-version }} - name: Setup workspace run: | From 929185fa7e3f28edcd83a7252618df208162a74d Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Thu, 14 Aug 2025 17:12:03 -0400 Subject: [PATCH 4/7] more testing --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b38b28b..892fac07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,12 +21,6 @@ jobs: - name: Checkout Repository uses: actions/checkout@v5 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - allow-prereleases: true - - name: Set up JDK 17 uses: actions/setup-java@v4 with: From 2da2b95ad2f70944deac834a6d5005d5fcaca167 Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Mon, 18 Aug 2025 11:58:49 -0400 Subject: [PATCH 5/7] revert changes and remove .python-version file --- .github/workflows/ci.yml | 9 +++++++-- .python-version | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 .python-version diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 892fac07..6f4322b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,18 +9,24 @@ on: branches: - develop +env: + UV_SYSTEM_PYTHON: true + jobs: ci: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - python-version: ["3.12", "3.13", "3.14"] + python-version: ["3.12", "3.13", "3.14-dev"] steps: - name: Checkout Repository uses: actions/checkout@v5 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: @@ -34,7 +40,6 @@ jobs: uses: astral-sh/setup-uv@v6 with: activate-environment: true - python-version: ${{ matrix.python-version }} - name: Setup workspace run: | diff --git a/.python-version b/.python-version deleted file mode 100644 index e4fba218..00000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.12 From b616ce684925d932109fec2b4830bf205823bea5 Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Mon, 18 Aug 2025 17:45:56 -0400 Subject: [PATCH 6/7] Fix typing issues in python 3.13 and 3.14 --- .../src/smithy_aws_event_stream/_private/serializers.py | 6 ++---- packages/smithy-core/src/smithy_core/aio/client.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/serializers.py b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/serializers.py index a96d38b5..63e2b0ac 100644 --- a/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/serializers.py +++ b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/serializers.py @@ -59,10 +59,8 @@ def begin_struct(self, schema: "Schema") -> Iterator[ShapeSerializer]: # Note that if we're serializing an operation input or output, it won't be a # union at all, so this won't get triggered. Thankfully, that's what we want. if schema.shape_type is ShapeType.UNION: - try: - yield self - finally: - return + yield self + return headers: dict[str, HEADER_VALUE] = {} diff --git a/packages/smithy-core/src/smithy_core/aio/client.py b/packages/smithy-core/src/smithy_core/aio/client.py index bf27c440..49e6eab5 100644 --- a/packages/smithy-core/src/smithy_core/aio/client.py +++ b/packages/smithy-core/src/smithy_core/aio/client.py @@ -310,7 +310,7 @@ async def _handle_execution[I: SerializeableShape, O: DeserializeableShape]( transport_request=interceptor.modify_before_retry_loop(request_context), ) - return await self._retry(call, request_context, request_future) + return await self._retry(call, request_context, request_future) # type: ignore[return-value] except Exception as e: return OutputContext( request=request_context.request, @@ -325,7 +325,7 @@ async def _retry[I: SerializeableShape, O: DeserializeableShape]( call: ClientCall[I, O], request_context: RequestContext[I, TRequest], request_future: Future[RequestContext[I, TRequest]] | None, - ) -> OutputContext[I, O, TRequest | None, TResponse | None]: + ) -> OutputContext[I, O, TRequest, TResponse | None]: if not call.retryable(): return await self._handle_attempt(call, request_context, request_future) From 630818bc64b430c207a70a765c69d3930b46113a Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Mon, 18 Aug 2025 17:46:12 -0400 Subject: [PATCH 7/7] test new workflow --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f4322b0..44e3381b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,8 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} - name: Set up JDK 17 uses: actions/setup-java@v4