Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

plugins/clnrest: Adding pyproject.toml for Poetry install #6651

Merged
merged 8 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Dockerfile
contrib/docker/Dockerfile.*
target
2 changes: 0 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ jobs:
# Export and then use pip to install into the current env
poetry export -o /tmp/requirements.txt --without-hashes --with dev
pip install -r /tmp/requirements.txt
# Make sure we have clnrest requirements, for check-manpages
pip install -r plugins/clnrest/requirements.txt
# We're going to check BOLT quotes, so get the latest version
git clone https://github.com/lightning/bolts.git ../${BOLTDIR}
- name: Configure
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/prototest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,3 @@ jobs:
-e TEST_GROUP_COUNT=1 \
-e TIMEOUT=120 \
cln-ci-ubuntu
- name: Upload Unit Test Results
if: always()
uses: actions/[email protected]
with:
name: Junit Report ${{ github.run_number }}.{{ matrix.cfg }}
path: report.*
13 changes: 8 additions & 5 deletions contrib/docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,22 @@ RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime

RUN locale-gen en_US.UTF-8 && dpkg-reconfigure --frontend noninteractive tzdata

COPY . .

# install package for python cryptography lib
# https://cryptography.io/en/latest/installation/#debian-ubuntu

RUN apt-get -qq update && \
apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \
build-essential libssl-dev libffi-dev \
python3-dev cargo
python3-dev cargo python3-pip

COPY . .

RUN pip install poetry && \
poetry export --without-hashes -o /tmp/requirements.txt && \
cat /tmp/requirements.txt && \
pip install -r /tmp/requirements.txt

# move the script in the root of the directory
RUN cp contrib/docker/scripts/*.sh .

RUN ls -la

CMD ["./contrib/docker/scripts/entrypoint.sh"]
1 change: 0 additions & 1 deletion contrib/docker/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ pip3 install --upgrade pip
pip3 install --user poetry
poetry export --dev --without-hashes -o requirements.txt
pip3 install -r requirements.txt
pip3 install -r plugins/clnrest/requirements.txt

git clone https://github.com/lightning/bolts.git ../bolts
git submodule update --init --recursive
Expand Down
843 changes: 422 additions & 421 deletions contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py

Large diffs are not rendered by default.

67 changes: 34 additions & 33 deletions contrib/pyln-grpc-proto/pyln/grpc/primitives_pb2.py

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

1 change: 0 additions & 1 deletion contrib/reprobuild/Dockerfile.focal
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ WORKDIR /build

CMD poetry export -o requirements.txt --without-hashes \
&& pip install -r requirements.txt \
&& pip install -r plugins/clnrest/requirements.txt \
&& mkdir -p /repro \
&& cd /repro \
&& unzip /build/release/*.zip \
Expand Down
1 change: 0 additions & 1 deletion contrib/reprobuild/Dockerfile.jammy
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ WORKDIR /build

CMD poetry export -o requirements.txt --without-hashes \
&& pip install -r requirements.txt \
&& pip install -r plugins/clnrest/requirements.txt \
&& mkdir -p /repro \
&& cd /repro \
&& unzip /build/release/*.zip \
Expand Down
Loading
Loading