Skip to content

Commit

Permalink
gci: Switch docs and CI builder to use poetry
Browse files Browse the repository at this point in the history
  • Loading branch information
cdecker authored and rustyrussell committed Mar 7, 2022
1 parent d51f97a commit 70840ef
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 38 deletions.
25 changes: 3 additions & 22 deletions .github/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,9 @@ export VALGRIND=${VALGRIND:-0}
export FUZZING=${FUZZING:-0}
export LIGHTNINGD_POSTGRES_NO_VACUUM=1

pip3 install --user -U \
-r requirements.lock

timeout 60 pip3 install --user \
--use-feature=in-tree-build \
./contrib/pyln-client \
./contrib/pyln-proto \
./contrib/pyln-testing

# Install utilities that aren't dependencies, but make
# running tests easier/feasible on CI (and pytest which
# keeps breaking the rerunfailures plugin).
pip3 install --user \
blinker \
flake8 \
flaky \
mako \
pytest-sentry \
pytest-test-groups==1.0.3 \
pytest-custom-exit-code==0.3.0 \
pytest-timeout \
pytest-json-report
pip3 install --user poetry
poetry config virtualenvs.create false --local
poetry install

git clone https://github.com/lightningnetwork/lightning-rfc.git ../lightning-rfc
git submodule update --init --recursive
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2.0.0

- name: Fetch tags for auto versioning
run: git fetch --prune --unshallow --tags -f

- name: Set up Python 3.6
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.6
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v2.0.0

- name: Fetch tags for auto versioning
run: git fetch --prune --unshallow --tags

- name: Set up Python 3.6
uses: actions/setup-python@v2
with:
Expand All @@ -36,7 +33,10 @@ jobs:
sudo mv bitcoin-$BITCOIN_VERSION/bin/* /usr/local/bin
)
pip install --upgrade mako pip
pip3 install --user poetry
poetry config virtualenvs.create false --local
poetry install
ln -s /usr/local/Cellar/gettext/0.20.1/bin/xgettext /usr/local/opt
export PATH="/usr/local/opt:$PATH"
Expand Down
15 changes: 7 additions & 8 deletions doc/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ Get dependencies:
sudo apt-get update
sudo apt-get install -y \
autoconf automake build-essential git libtool libgmp-dev libsqlite3-dev \
python3 python3-mako python3-pip net-tools zlib1g-dev libsodium-dev \
gettext
pip3 install --user mrkd mistune==0.8.4
python3 python3-pip net-tools zlib1g-dev libsodium-dev gettext
pip install --user poetry
poetry install

If you don't have Bitcoin installed locally you'll need to install that
as well. It's now available via [snapd](https://snapcraft.io/bitcoin-core).
Expand All @@ -60,8 +60,6 @@ For development or running tests, get additional dependencies:

sudo apt-get install -y valgrind libpq-dev shellcheck cppcheck \
libsecp256k1-dev jq
pip3 install --upgrade pip
pip3 install --user -r requirements.txt

Build lightning:

Expand Down Expand Up @@ -150,7 +148,8 @@ fiddle with compile time options:
mrkd is required to build man pages from markdown files (not done by the port):

# cd /usr/ports/devel/py-pip && make install
$ pip install --user mrkd
$ pip install --user poetry
$ poetry install

See `/usr/ports/net-p2p/c-lightning/Makefile` for instructions on how to
build from an arbitrary git commit, instead of the latest release tag.
Expand Down Expand Up @@ -183,8 +182,8 @@ pkg_add autoconf # (select highest version, autoconf-2.69p2 at time of writing)
```
Install `mako` and `mrkd` otherwise we run into build errors:
```
pip3.7 install --user mako
pip3.7 install --user mrkd
pip3.7 install --user poetry
poetry install
```

Add `/home/<username>/.local/bin` to your path:
Expand Down
7 changes: 7 additions & 0 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 70840ef

Please sign in to comment.