mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-03-01 17:47:30 +01:00
python: Consolidate requirements.txt files in a single place
We had them split according the separate use-cases: - testing - doc-gen - wire-gen But that was causing new contributors to miss some dependencies when they first got hacking. So this consolidates all of our own dependencies in a root requirements.txt, with the notable exception of `pyln-client`, `pyln-testing` and `pyln-proto` which are distributed as PyPI modules and therefore have their own dependencies that need to be tracked in the module root. Closes #3518
This commit is contained in:
parent
25405191fb
commit
b68066e8e8
7 changed files with 23 additions and 27 deletions
|
@ -36,8 +36,6 @@ pip3 install --user -U --quiet --progress-bar off \
|
||||||
|
|
||||||
pip3 install --user -U --quiet --progress-bar off \
|
pip3 install --user -U --quiet --progress-bar off \
|
||||||
-r requirements.txt \
|
-r requirements.txt \
|
||||||
-r tests/requirements.txt \
|
|
||||||
-r doc/requirements.txt \
|
|
||||||
-r contrib/pyln-client/requirements.txt \
|
-r contrib/pyln-client/requirements.txt \
|
||||||
-r contrib/pyln-proto/requirements.txt \
|
-r contrib/pyln-proto/requirements.txt \
|
||||||
-r contrib/pyln-testing/requirements.txt
|
-r contrib/pyln-testing/requirements.txt
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -268,7 +268,7 @@ check: check-units installcheck pytest
|
||||||
|
|
||||||
pytest: $(ALL_PROGRAMS)
|
pytest: $(ALL_PROGRAMS)
|
||||||
ifeq ($(PYTEST),)
|
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
|
exit 1
|
||||||
else
|
else
|
||||||
# Explicitly hand DEVELOPER and VALGRIND so you can override on make cmd line.
|
# Explicitly hand DEVELOPER and VALGRIND so you can override on make cmd line.
|
||||||
|
|
|
@ -165,9 +165,7 @@ pip3 install --user \
|
||||||
-r requirements.txt \
|
-r requirements.txt \
|
||||||
-r contrib/pyln-client/requirements.txt \
|
-r contrib/pyln-client/requirements.txt \
|
||||||
-r contrib/pyln-proto/requirements.txt \
|
-r contrib/pyln-proto/requirements.txt \
|
||||||
-r contrib/pyln-testing/requirements.txt \
|
-r contrib/pyln-testing/requirements.txt
|
||||||
-r tests/requirements.txt \
|
|
||||||
-r doc/requirements.txt
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Re-run `configure` for the python dependencies
|
Re-run `configure` for the python dependencies
|
||||||
|
|
|
@ -55,7 +55,7 @@ Clone lightning:
|
||||||
For development or running tests, get additional dependencies:
|
For development or running tests, get additional dependencies:
|
||||||
|
|
||||||
sudo apt-get install -y valgrind python3-pip libpq-dev
|
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:
|
Build lightning:
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
|
@ -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
|
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
|
||||||
|
|
|
@ -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
|
|
Loading…
Add table
Reference in a new issue