diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 603ad8c0a954..de6ce9137233 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -63,7 +63,6 @@ jobs: blinker \ flake8 \ mako \ - mrkd \ pytest-sentry \ pytest-test-groups==1.0.3 \ pytest-custom-exit-code==0.3.0 \ diff --git a/contrib/docker/Dockerfile.alpine b/contrib/docker/Dockerfile.alpine index d1ab045f9f05..62261ef3d3d4 100644 --- a/contrib/docker/Dockerfile.alpine +++ b/contrib/docker/Dockerfile.alpine @@ -15,7 +15,6 @@ COPY . lightning RUN cd lightning && \ git submodule update --init --recursive && \ ./configure && \ - pip3 install mrkd mistune==0.8.4 && \ make -j$(nproc) && \ make install diff --git a/contrib/docker/Dockerfile.builder b/contrib/docker/Dockerfile.builder index ff4d15fed2b0..4d24adab9c4b 100644 --- a/contrib/docker/Dockerfile.builder +++ b/contrib/docker/Dockerfile.builder @@ -65,5 +65,4 @@ RUN pip3 install --upgrade pip && \ tqdm==4.26.0 \ pytest-test-groups==1.0.3 \ flake8==3.5.0 \ - pytest-rerunfailures==3.1 \ - mrkd==0.1.6 + pytest-rerunfailures==3.1 diff --git a/contrib/docker/Dockerfile.builder.fedora b/contrib/docker/Dockerfile.builder.fedora index 897e4d0c3949..4a43c033e2e8 100644 --- a/contrib/docker/Dockerfile.builder.fedora +++ b/contrib/docker/Dockerfile.builder.fedora @@ -32,4 +32,4 @@ RUN wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_ rm -rf bitcoin.tar.gz bitcoin-$BITCOIN_VERSION RUN python3 -m pip install --upgrade pip && \ - 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 + 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 diff --git a/contrib/docker/linuxarm32v7.Dockerfile b/contrib/docker/linuxarm32v7.Dockerfile index ffcfb490792c..c0153d09c659 100644 --- a/contrib/docker/linuxarm32v7.Dockerfile +++ b/contrib/docker/linuxarm32v7.Dockerfile @@ -92,7 +92,6 @@ RUN git clone --recursive /tmp/lightning . && \ ARG DEVELOPER=0 ENV PYTHON_VERSION=3 -RUN pip3 install mrkd RUN ./configure --prefix=/tmp/lightning_install --enable-static && make -j3 DEVELOPER=${DEVELOPER} && make install FROM arm32v7/debian:buster-slim as final diff --git a/contrib/docker/linuxarm64v8.Dockerfile b/contrib/docker/linuxarm64v8.Dockerfile index 3e8fe5d3f982..89be7a46b121 100644 --- a/contrib/docker/linuxarm64v8.Dockerfile +++ b/contrib/docker/linuxarm64v8.Dockerfile @@ -91,7 +91,6 @@ RUN git clone --recursive /tmp/lightning . && \ ARG DEVELOPER=0 ENV PYTHON_VERSION=3 -RUN pip3 install mrkd RUN ./configure --prefix=/tmp/lightning_install --enable-static && make -j3 DEVELOPER=${DEVELOPER} && make install FROM arm64v8/debian:buster-slim as final diff --git a/doc/INSTALL.md b/doc/INSTALL.md index a56fae0bb86a..eeac81d4abda 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -76,7 +76,6 @@ There are two ways to build core lightning, and this depends on how you want use To build cln to just install a tagged or master version you can use the following commands: pip3 install --upgrade pip - pip3 install mako mistune==0.8.4 mrkd ./configure make sudo make install @@ -175,7 +174,7 @@ fiddle with compile time options: # cd /usr/ports/net-p2p/c-lightning && make install -mrkd is required to build man pages from markdown files (not done by the port): +Install the python dependencies. # cd /usr/ports/devel/py-pip && make install $ pip install --user poetry @@ -210,7 +209,9 @@ pkg_add git python gmake py3-pip libtool gmp pkg_add automake # (select highest version, automake1.16.2 at time of writing) pkg_add autoconf # (select highest version, autoconf-2.69p2 at time of writing) ``` -Install `mako` and `mrkd` otherwise we run into build errors: + +Install python dependencies with `poetry` + ``` pip3.7 install --user poetry poetry install diff --git a/pyproject.toml b/pyproject.toml index fae5d0130ee6..623e5cad90e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,6 @@ python = "^3.7" pyln-client = { path = "./contrib/pyln-client", develop = true } pyln-proto = { path = "./contrib/pyln-proto", develop = true } Mako = "^1.1.6" -mrkd = { git = "https://github.com/refi64/mrkd.git", rev = "781f05eb9898ca652f18eed29b3c956389e6a2a7" } websocket-client = "^1.2.3" grpcio-tools = "1.47.0" grpcio = "1.47.0"