Inline CI steps for installing Twisted trunk

Signed-off-by: Dan Callahan <danc@element.io>

2 files changed, 11 insertions, 25 deletions

diff --git a/.ci/patch_for_twisted_trunk.sh b/.ci/patch_for_twisted_trunk.sh
deleted file mode 100755
index 96368f9ba2..0000000000
--- a/.ci/patch_for_twisted_trunk.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# replaces the dependency on Twisted with Twisted's trunk.
-
-set -xe
-cd "$(dirname "$0")"/..
-
-# We could make full use of the poetry machinery (rather than just `pip install ...`)
-# so that we can catch dependency resolver problems that could arise from twisted
-# bumping its dependencies...
-# sed -ibackup -e 's!^Twisted = .*!Twisted = { git = "https://github.com/twisted/twisted.git", rev = "trunk" }!' pyproject.toml
-# poetry lock --no-update
-# poetry install --no-interaction --extras "all test"
-
-# ...except we run into https://github.com/python-poetry/poetry/issues/5311, where
-# poetry insists on installing an old version of treq, which isn't actually compatible
-# with recent twisted releases. So let's just install twisted trunk using pip.
-poetry install --no-interaction --extras "all test"
-poetry run pip install git+https://github.com/twisted/twisted.git@trunk
-
-# Confirm the version of twisted in use
-poetry run pip show twisted
diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml
index de44428b1c..03aaab241f 100644
--- a/.github/workflows/twisted_trunk.yml
+++ b/.github/workflows/twisted_trunk.yml
@@ -20,7 +20,10 @@ jobs:
         with:
           python-version: "3.x"
           extras: "all"
-      - run: .ci/patch_for_twisted_trunk.sh
+      - run: |
+          poetry remove twisted
+          poetry add --extras tls git+https://github.com/twisted/twisted.git#trunk
+          poetry install --no-interaction --extras "all test"
       - run: poetry run mypy
 
   trial:
@@ -33,7 +36,10 @@ jobs:
         with:
           python-version: "3.x"
           extras: "all test"
-      - run: .ci/patch_for_twisted_trunk.sh
+      - run: |
+          poetry remove twisted
+          poetry add --extras tls git+https://github.com/twisted/twisted.git#trunk
+          poetry install --no-interaction --extras "all test"
       - run: poetry run trial --jobs 2 tests
 
       - name: Dump logs
@@ -65,7 +71,9 @@ jobs:
         #       Tidying up is important because `/src` is a mounted volume.
         run: |
           ln -s -T /venv /src/.venv
-          .ci/patch_for_twisted_trunk.sh
+          poetry remove twisted
+          poetry add --extras tls git+https://github.com/twisted/twisted.git#trunk
+          poetry install --no-interaction --extras "all test"
           rm /src/.venv
         working-directory: /src
       - name: Run SyTest