Skip to content

Commit 8e6ad75

Browse files
committed
remove all mrkd references from project
1 parent 838400c commit 8e6ad75

File tree

8 files changed

+6
-11
lines changed

8 files changed

+6
-11
lines changed

.github/workflows/bsd.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
blinker \
6464
flake8 \
6565
mako \
66-
mrkd \
6766
pytest-sentry \
6867
pytest-test-groups==1.0.3 \
6968
pytest-custom-exit-code==0.3.0 \

contrib/docker/Dockerfile.alpine

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ COPY . lightning
1515
RUN cd lightning && \
1616
git submodule update --init --recursive && \
1717
./configure && \
18-
pip3 install mrkd mistune==0.8.4 && \
1918
make -j$(nproc) && \
2019
make install
2120

contrib/docker/Dockerfile.builder

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,4 @@ RUN pip3 install --upgrade pip && \
6565
tqdm==4.26.0 \
6666
pytest-test-groups==1.0.3 \
6767
flake8==3.5.0 \
68-
pytest-rerunfailures==3.1 \
69-
mrkd==0.1.6
68+
pytest-rerunfailures==3.1

contrib/docker/Dockerfile.builder.fedora

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ RUN wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_
3232
rm -rf bitcoin.tar.gz bitcoin-$BITCOIN_VERSION
3333

3434
RUN python3 -m pip install --upgrade pip && \
35-
python3 -m pip install python-bitcoinlib==0.10.2 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1 ephemeral-port-reserve==1.1.0 mrkd==0.1.6
35+
python3 -m pip install python-bitcoinlib==0.10.2 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1 ephemeral-port-reserve==1.1.0

contrib/docker/linuxarm32v7.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ RUN git clone --recursive /tmp/lightning . && \
9292

9393
ARG DEVELOPER=0
9494
ENV PYTHON_VERSION=3
95-
RUN pip3 install mrkd
9695
RUN ./configure --prefix=/tmp/lightning_install --enable-static && make -j3 DEVELOPER=${DEVELOPER} && make install
9796

9897
FROM arm32v7/debian:buster-slim as final

contrib/docker/linuxarm64v8.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ RUN git clone --recursive /tmp/lightning . && \
9191

9292
ARG DEVELOPER=0
9393
ENV PYTHON_VERSION=3
94-
RUN pip3 install mrkd
9594
RUN ./configure --prefix=/tmp/lightning_install --enable-static && make -j3 DEVELOPER=${DEVELOPER} && make install
9695

9796
FROM arm64v8/debian:buster-slim as final

doc/INSTALL.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ There are two ways to build core lightning, and this depends on how you want use
7676
To build cln to just install a tagged or master version you can use the following commands:
7777

7878
pip3 install --upgrade pip
79-
pip3 install mako mistune==0.8.4 mrkd
8079
./configure
8180
make
8281
sudo make install
@@ -175,7 +174,7 @@ fiddle with compile time options:
175174

176175
# cd /usr/ports/net-p2p/c-lightning && make install
177176

178-
mrkd is required to build man pages from markdown files (not done by the port):
177+
Install the python dependencies.
179178

180179
# cd /usr/ports/devel/py-pip && make install
181180
$ pip install --user poetry
@@ -210,7 +209,9 @@ pkg_add git python gmake py3-pip libtool gmp
210209
pkg_add automake # (select highest version, automake1.16.2 at time of writing)
211210
pkg_add autoconf # (select highest version, autoconf-2.69p2 at time of writing)
212211
```
213-
Install `mako` and `mrkd` otherwise we run into build errors:
212+
213+
Install python dependencies with `poetry`
214+
214215
```
215216
pip3.7 install --user poetry
216217
poetry install

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ python = "^3.7"
1010
pyln-client = { path = "./contrib/pyln-client", develop = true }
1111
pyln-proto = { path = "./contrib/pyln-proto", develop = true }
1212
Mako = "^1.1.6"
13-
mrkd = { git = "https://github.com/refi64/mrkd.git", rev = "781f05eb9898ca652f18eed29b3c956389e6a2a7" }
1413
websocket-client = "^1.2.3"
1514
grpcio-tools = "1.47.0"
1615
grpcio = "1.47.0"

0 commit comments

Comments
 (0)