diff --git a/.travis/build.sh b/.travis/build.sh index 498faa1c8..fb98b259d 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -36,8 +36,6 @@ pip3 install --user -U --quiet --progress-bar off \ pip3 install --user -U --quiet --progress-bar off \ -r requirements.txt \ - -r tests/requirements.txt \ - -r doc/requirements.txt \ -r contrib/pyln-client/requirements.txt \ -r contrib/pyln-proto/requirements.txt \ -r contrib/pyln-testing/requirements.txt diff --git a/Makefile b/Makefile index 25bf664e6..3195140e4 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,7 @@ check: check-units installcheck pytest pytest: $(ALL_PROGRAMS) ifeq ($(PYTEST),) - @echo "py.test is required to run the integration tests, please install using 'pip3 install -r tests/requirements.txt', and rerun 'configure'." + @echo "py.test is required to run the integration tests, please install using 'pip3 install -r requirements.txt', and rerun 'configure'." exit 1 else # Explicitly hand DEVELOPER and VALGRIND so you can override on make cmd line. diff --git a/doc/HACKING.md b/doc/HACKING.md index a391f3297..80355e17c 100644 --- a/doc/HACKING.md +++ b/doc/HACKING.md @@ -165,9 +165,7 @@ pip3 install --user \ -r requirements.txt \ -r contrib/pyln-client/requirements.txt \ -r contrib/pyln-proto/requirements.txt \ - -r contrib/pyln-testing/requirements.txt \ - -r tests/requirements.txt \ - -r doc/requirements.txt + -r contrib/pyln-testing/requirements.txt ``` Re-run `configure` for the python dependencies diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 8a200bb25..f0f921037 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -55,7 +55,7 @@ Clone lightning: For development or running tests, get additional dependencies: sudo apt-get install -y valgrind python3-pip libpq-dev - sudo pip3 install -r tests/requirements.txt -r doc/requirements.txt + sudo pip3 install -r requirements.txt Build lightning: diff --git a/doc/requirements.txt b/doc/requirements.txt deleted file mode 100644 index 5c76061d5..000000000 --- a/doc/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -sphinx-rtd-theme==0.4.2 -sphinxcontrib-websupport==1.1.0 -m2r==0.2.1 -Sphinx==1.8.4 -commonmark==0.8.1 -recommonmark==0.5.0 -mrkd==0.1.6 diff --git a/requirements.txt b/requirements.txt index f9a2f5388..74beec225 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,21 @@ +Flask==1.1.1 +Sphinx==1.8.4 +cheroot==8.2.1 +commonmark==0.8.1 +ephemeral-port-reserve==1.1.1 +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.3.1 +python-bitcoinlib==0.10.2 +recommonmark==0.5.0 +sphinx-rtd-theme==0.4.2 +sphinxcontrib-websupport==1.1.0 +tqdm==4.32.2 diff --git a/tests/requirements.txt b/tests/requirements.txt deleted file mode 100644 index 54472f014..000000000 --- a/tests/requirements.txt +++ /dev/null @@ -1,13 +0,0 @@ -flake8==3.7.8 -pytest==5.3.1 -Flask==1.1.1 -cheroot==8.2.1 -ephemeral-port-reserve==1.1.1 -flaky==3.6.1 -pytest-benchmark==3.2.2 -pytest-forked==1.0.2 -pytest-xdist==1.29.0 -python-bitcoinlib==0.10.2 -tqdm==4.32.2 -pytest-timeout==1.3.3 -psycopg2-binary==2.8.4