From fc677e331a3bad12d08d6af1c314e8e136b20358 Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Wed, 23 Dec 2020 12:06:48 +0100
Subject: [PATCH] pyln: Update dependencies for all pyln packages

We were getting a number of incompatibility warning due to the
dependencies being expressed too rigidly. This losens the requirement
definitions to being compatible with a known good version, and while
we're at it we also bump all outdated requirements.
---
 contrib/pylightning/requirements.txt  |  2 +-
 contrib/pyln-client/requirements.txt  |  2 +-
 contrib/pyln-proto/requirements.txt   | 12 +++---
 contrib/pyln-testing/requirements.txt | 15 +++++---
 requirements.txt                      | 55 +++++++++++++++++----------
 5 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/contrib/pylightning/requirements.txt b/contrib/pylightning/requirements.txt
index 83e1329cc..e5d9b8976 100644
--- a/contrib/pylightning/requirements.txt
+++ b/contrib/pylightning/requirements.txt
@@ -1 +1 @@
-pyln-client==0.9.3
+pyln-client ~= 0.9.3
diff --git a/contrib/pyln-client/requirements.txt b/contrib/pyln-client/requirements.txt
index cf72f55d1..2b99830cb 100644
--- a/contrib/pyln-client/requirements.txt
+++ b/contrib/pyln-client/requirements.txt
@@ -1 +1 @@
-recommonmark>=0.6.0
+recommonmark>=0.7.*
diff --git a/contrib/pyln-proto/requirements.txt b/contrib/pyln-proto/requirements.txt
index bf7ed6aae..3b2d7cfd6 100644
--- a/contrib/pyln-proto/requirements.txt
+++ b/contrib/pyln-proto/requirements.txt
@@ -1,6 +1,6 @@
-bitstring==3.1.6
-cryptography==3.2
-coincurve==13.0.0
-base58==1.0.2
-mypy==0.790
-pysocks==1.7.*
+base58 ~= 2.0.1
+bitstring ~= 3.1.6
+coincurve ~= 13.0.0
+cryptography ~= 3.2
+mypy ~= 0.790
+pysocks ~= 1.7.1
diff --git a/contrib/pyln-testing/requirements.txt b/contrib/pyln-testing/requirements.txt
index a4c3c9324..d1ad9cf23 100644
--- a/contrib/pyln-testing/requirements.txt
+++ b/contrib/pyln-testing/requirements.txt
@@ -1,9 +1,12 @@
-pytest==5.*
-pytest-rerunfailures==9.1
-Flask==1.1.1
-cheroot==8.2.1
+Flask==1.1.*
+cheroot==8.5.*
 ephemeral-port-reserve==1.1.1
-python-bitcoinlib==0.10.2
-psycopg2-binary==2.8.4
 filelock==3.0.*
+flaky ~= 3.7.0
 psutil==5.7.*
+psycopg2-binary==2.8.*
+pytest-rerunfailures==9.1.1
+pytest-timeout ~= 1.4.2
+pytest-xdist ~= 2.2.0
+pytest==6.1.*
+python-bitcoinlib==0.11.*
diff --git a/requirements.txt b/requirements.txt
index 4c99bca64..fc1e8e7dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,28 +1,41 @@
+# Dependencies required to build and test c-lightning
 https://github.com/ElementsProject/libwally-core/releases/download/release_0.8.0/wallycore-0.8.0-cp36-cp36m-linux_x86_64.whl; 'linux' in sys_platform and python_version == '3.6'
 https://github.com/ElementsProject/libwally-core/releases/download/release_0.8.0/wallycore-0.8.0-cp37-cp37m-linux_x86_64.whl; 'linux' in sys_platform and python_version == '3.7'
 https://github.com/ElementsProject/libwally-core/releases/download/release_0.8.0/wallycore-0.8.0-cp37-cp37m-macosx_10_14_x86_64.whl; sys_platform == 'darwin' and python_version == '3.7'
-Flask==1.1.1
-Sphinx==1.8.4
-base58==1.0.2
-bitstring==3.1.6
-cheroot==8.2.1
-coincurve==13.0.0
-commonmark==0.8.1
-cryptography==3.2
-ephemeral-port-reserve==1.1.1
+mrkd ~= 0.1.6
+Mako ~= 1.1.3
+
+# Dependencies from pyln-client
+Sphinx ~= 3.4.0
 flake8==3.7.8
-flaky==3.6.1
-m2r==0.2.1
-mako==1.0.14
-mrkd==0.1.6
-psycopg2-binary==2.8.4
-pytest-benchmark==3.2.2
-pytest-forked==1.0.2
-pytest-timeout==1.3.3
-pytest-xdist==1.29.0
-pytest == 5.*
-python-bitcoinlib==0.10.2
-recommonmark>=0.6.0
+recommonmark>=0.7.*
 sphinx-rtd-theme==0.4.2
 sphinxcontrib-websupport==1.1.0
 tqdm==4.32.2
+
+# Dependencies from pyln-testing
+Flask==1.1.*
+cheroot==8.5.*
+ephemeral-port-reserve==1.1.1
+filelock==3.0.*
+flaky ~= 3.7.0
+psutil==5.7.*
+psycopg2-binary==2.8.*
+pytest-rerunfailures==9.1.1
+pytest-timeout ~= 1.4.2
+pytest-xdist ~= 2.2.0
+pytest==6.1.*
+python-bitcoinlib==0.11.*
+
+# Dependencies from pyln-proto
+base58 ~= 2.0.1
+bitstring ~= 3.1.6
+coincurve ~= 13.0.0
+cryptography ~= 3.2
+mypy ~= 0.790
+pysocks ~= 1.7.1
+
+# Dependencies from pyln-spec
+# None
+
+