diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ac931be0..64ad2a331 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,12 +5,12 @@ on: push: branches: - master - - v[0-9]+.[0-9]+.x + - v?[0-9]+.[0-9]+.x - gha-* pull_request: branches: - master - - v[0-9]+.[0-9]+.x + - v?[0-9]+.[0-9]+.x jobs: tests: diff --git a/dev-requirements.txt b/dev-requirements.txt index 8fbec0919..27126b701 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -22,6 +22,7 @@ sphinx-rfcsection~=0.1.1 vcrpy @ git+https://github.com/sopel-irc/vcrpy@uncap-urllib3 # also have to use a version of urllib3 that doesn't use the `version_string` # attr of the response object, because vcrpy won't support it until 7.x +# reverting to mainline vcrpy is tracked in #2456 urllib3<2.3 # type check # often breaks CI on master, so pin and update deliberately, on our own terms