From dcfc3e9e5e247d59060897f04068c333c31184bd Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 12 Nov 2021 08:06:18 -0500
Subject: [PATCH] try with a direct reference in setup.cfg
---
.circleci/config.yml | 3 ---
.github/workflows/ci.yaml | 2 --
setup.cfg | 7 ++++++-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2751d76..c7a3456 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 66cf508..8ad846a 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 0c4f044..7eeb138 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
--
GitLab