From 65137115d358fd378019b408b4f3ca54c0ee9aaf Mon Sep 17 00:00:00 2001 From: Gary Yendell Date: Thu, 7 Aug 2025 15:52:35 +0000 Subject: [PATCH 1/2] Add setuptools to dev requirements for aioca --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 6cc7cca65..53af0c339 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,6 +48,7 @@ dev = [ "sphinx-design", "tox-direct", "types-mock", + "setuptools>=70.1", # https://github.com/DiamondLightSource/aioca/issues/71 "aioca", "p4p", "httpx", From 2c37b33d6484580b8e8f6c8667298c5f71574f2e Mon Sep 17 00:00:00 2001 From: Gary Yendell Date: Thu, 7 Aug 2025 16:07:37 +0000 Subject: [PATCH 2/2] Remove bodge from CI --- .github/workflows/_test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 3e5879cb9..f652d4145 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -50,9 +50,6 @@ jobs: python-version: ${{ inputs.python-version }} pip-install: ".[dev]" - - name: Update setuptools - run: pip install --upgrade setuptools - - name: Run tests run: tox -e tests