From 245e6a83dafa03ad2691399f2ce9202b9b7b6ca8 Mon Sep 17 00:00:00 2001
From: Michael Schmoock <michael@schmoock.net>
Date: Tue, 27 Dec 2022 18:12:34 +0100
Subject: [PATCH] ci: install pyln client and testing via cln repo

---
 .ci/test.py                | 6 +++---
 .github/workflows/main.yml | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.ci/test.py b/.ci/test.py
index 5a6a530..2dbd74f 100644
--- a/.ci/test.py
+++ b/.ci/test.py
@@ -25,7 +25,6 @@ global_dependencies = [
     'pytest==5.*',
     'pytest-xdist',
     'pytest-timeout',
-    'pyln-testing',
     'pytest-rerunfailures',
 ]
 
@@ -163,6 +162,7 @@ def prepare_env_pip(p: Plugin, directory: Path):
 
 def install_pyln_testing(pip_path):
     # Many plugins only implicitly depend on pyln-testing, so let's help them
+    cln_path = os.environ['CLN_PATH']
     pip_opts = ['-qq']
     subprocess.check_call(
         [pip_path, 'install', '-U', *pip_opts, 'pip', 'wheel'],
@@ -172,8 +172,8 @@ def install_pyln_testing(pip_path):
     subprocess.check_call(
         [
             pip_path, 'install', '-U', *pip_opts,
-            'pyln-testing==0.10.1',
-            "pyln-client==0.10.1",
+            cln_path + "/contrib/pyln-client",
+            cln_path + "/contrib/pyln-testing",
             "Flask==1.1.0",
             "MarkupSafe==2.0.1",
             'itsdangerous==1.1.0'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7398101..07137c5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -75,6 +75,7 @@ jobs:
         poetry update
         poetry export --without-hashes -f requirements.txt --output requirements.txt
         pip install --user -U -r requirements.txt
+        pip install --user contrib/pyln-client contrib/pyln-testing
 
         ./configure --disable-valgrind
         make -j 16
@@ -93,5 +94,6 @@ jobs:
         export SLOW_MACHINE=1
         export TEST_DEBUG=1
         export TRAVIS=1
-        pip3 install -U virtualenv pip > /dev/null
+        export CLN_PATH=${{ github.workspace }}/lightning
+        pip3 install --user -U virtualenv pip > /dev/null
         python3 .ci/test.py