From 1bebdfdd5fd4d2303591459196438510b286b96c Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Fri, 19 Mar 2021 12:42:53 +0100 Subject: [PATCH] make: Setup the PYTHONPATH to include the pyln-spec packages They are currently not installable due to circular dependencies and stuff, so we just add their source to the path and lnprototest will pick them up from there. --- Makefile | 2 +- requirements.txt | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4f1b95805..09b507eee 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ endif # (method=thread to support xdist) PYTEST_OPTS := -v -p no:logging $(PYTEST_OPTS) -PYTHONPATH=$(shell pwd)/contrib/pyln-client:$(shell pwd)/contrib/pyln-testing:$(shell pwd)/contrib/pyln-proto/:$(shell pwd)/external/lnprototest +PYTHONPATH=$(shell pwd)/contrib/pyln-client:$(shell pwd)/contrib/pyln-testing:$(shell pwd)/contrib/pyln-proto/:$(shell pwd)/external/lnprototest:$(shell pwd)/contrib/pyln-spec/bolt1:$(shell pwd)/contrib/pyln-spec/bolt2:$(shell pwd)/contrib/pyln-spec/bolt4:$(shell pwd)/contrib/pyln-spec/bolt7 # This is where we add new features as bitcoin adds them. FEATURES := diff --git a/requirements.txt b/requirements.txt index f37e657cd..006d91723 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,9 +14,4 @@ flake8 ~= 3.7.8 # None # Dependencies from lnprototest -pyln.bolt1==1.0.1.137 -pyln.bolt2==1.0.1.137 -pyln.bolt4==1.0.1.137 -pyln.bolt7==1.0.1.137 -coincurve==13.0.0 crc32c