diff --git a/.circleci/config.yml b/.circleci/config.yml index 2751d76e936cad3631f0337504120e76316bb7c1..c7a34563355d1c80c3b31ee076ac1cc002ab3036 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,9 +120,6 @@ jobs: # dependencies into the environment. venv/bin/pip install --no-index --find-links file://${PWD}/wheelhouse .[test] - # For a while we depend on a pretty fresh Tahoe - pip install https://github.com/tahoe-lafs/tahoe-lafs/archive/refs/heads/3842.allocate_buckets-without-lease-renewal.zip - - run: name: "Test" command: | diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 66cf508aeccb93cd357f9384a0304cd2028744ff..8ad846a84580a397c4b451643c401b80e5d2e438 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,8 +40,6 @@ jobs: - name: "Install ZKAPAuthorizer and dependencies" run: | python -m pip install -v ./[test] - # For a while we depend on a pretty fresh Tahoe - pip install https://github.com/tahoe-lafs/tahoe-lafs/archive/refs/heads/3842.allocate_buckets-without-lease-renewal.zip - name: "Dump Python Environment" run: | diff --git a/setup.cfg b/setup.cfg index 0c4f044719917527c1935362b1b2b41492e8b4c3..7eeb1388a7d0cb2545e5675f567dd36e112dc7ae 100644 --- a/setup.cfg +++ b/setup.cfg @@ -40,7 +40,12 @@ install_requires = # incompatible with Tahoe-LAFS'. So duplicate them here (the ones that # have been observed to cause problems). Twisted[tls,conch]>=18.4.0 - tahoe-lafs >=1.14, <1.17, !=1.15.* + + # Lease renewal changes aren't available from a release of Tahoe yet, or + # even the main branch... Note "Public index servers SHOULD NOT allow the + # use of direct references in uploaded distributions." + # https://www.python.org/dev/peps/pep-0440/#direct-references + tahoe-lafs @ https://github.com/tahoe-lafs/tahoe-lafs/archive/refs/heads/3842.allocate_buckets-without-lease-renewal.zip treq pyutil