From 7ea1d584219b4ee538dc8deee3ee206d6151d25a Mon Sep 17 00:00:00 2001 From: David Brochart Date: Mon, 12 May 2025 14:20:42 +0200 Subject: [PATCH 1/3] Run tests on multiple Python versions --- .github/workflows/test.yml | 18 ++++++++++++------ environment-dev.yml | 6 ------ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 environment-dev.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb74980..9383896 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,24 +28,30 @@ jobs: echo " pre-commit run --all-files --hook-stage=manual" test: - name: Run tests on ${{ matrix.os }} + name: Run tests on ${{ matrix.os }} python-${{ matrix.python-version }} runs-on: ${{ matrix.os }} strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] + python-version: + - '3.9' + - '3.10' + - '3.11' + - '3.12' + - '3.13' + - 'pypy3.9' + - 'pypy3.10' defaults: run: shell: bash -l {0} steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Install mamba - uses: mamba-org/setup-micromamba@v1 + - uses: actions/setup-node@v4 + - uses: actions/setup-python@v5 with: - environment-file: environment-dev.yml - environment-name: pycrdt-websocket - extra-specs: python=${{ matrix.python-version }} + python-version: ${{ matrix.python-version }} - name: Ensure pip >= v25.1 run: python -m pip install "pip >= 25.1" - name: Install dependencies diff --git a/environment-dev.yml b/environment-dev.yml deleted file mode 100644 index b39383f..0000000 --- a/environment-dev.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: pycrdt-websocket -channels: - - conda-forge -dependencies: - - pip - - nodejs From b6b3d3d920759bc51371adae860f437b4edf8c3c Mon Sep 17 00:00:00 2001 From: David Brochart Date: Mon, 12 May 2025 14:24:09 +0200 Subject: [PATCH 2/3] Fix typing --- tests/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/utils.py b/tests/utils.py index 958b078..5bbb188 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from anyio import Lock, connect_tcp, create_memory_object_stream from pycrdt import Array, Doc From 9715bccffa1b9618cbbd1ffb7a2f3bb90a70a11e Mon Sep 17 00:00:00 2001 From: David Brochart Date: Mon, 12 May 2025 14:31:09 +0200 Subject: [PATCH 3/3] Again --- .github/workflows/test.yml | 1 + tests/utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9383896..0da3512 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,6 +42,7 @@ jobs: - '3.13' - 'pypy3.9' - 'pypy3.10' + - 'pypy3.11' defaults: run: shell: bash -l {0} diff --git a/tests/utils.py b/tests/utils.py index 5bbb188..182491a 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -64,7 +64,7 @@ async def recv(self) -> bytes: class ClientWebsocket: - def __init__(self, server_websocket: "ServerWebsocket"): + def __init__(self, server_websocket: ServerWebsocket): self.server_websocket = server_websocket self.send_stream, self.receive_stream = create_memory_object_stream[bytes](65536)