This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/develop by this push:
new de1186c feat: Added support for syntrax
de1186c is described below
commit de1186cb80c3837481974faca65b2f282ed83833
Author: Christofer Dutz <[email protected]>
AuthorDate: Tue Sep 17 21:22:31 2024 +0200
feat: Added support for syntrax
---
Dockerfile | 11 ++++++++++-
.../src/main/resources/archetype-resources/Dockerfile | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 1e877d1..83516ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN cargo install svgbob_cli
RUN cp /root/.cargo/bin/svgbob_cli /usr/local/bin
# Forced version of pillow as with version 10 the build fails
-RUN python3 -m pip install --upgrade pip setuptools seqdiag blockdiag actdiag
nwdiag convert racks opc-diag pillow==9.5.0
+RUN python3 -m pip install --upgrade pip setuptools==57.5.0 seqdiag blockdiag
actdiag nwdiag convert racks opc-diag pillow==9.5.0
#ENV CONDA_DIR /opt/conda
#RUN wget
https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-aarch64.sh -O
/root/miniconda.sh
@@ -60,6 +60,15 @@ RUN apt install -y golang
ENV PATH=/root/go/bin:$PATH
RUN go install github.com/kaishuu0123/[email protected]
+# Install Syntrax
+# https://kevinpt.github.io/syntrax/
+# Problem is, that newer versions of python don't have use_2to3
+#RUN apt install -y libcairo2-dev pkg-config python3-dev python3-gi
python3-gi-cairo gir1.2-gtk-4.0
+RUN apt install -y libcairo2-dev pkg-config python3-dev python3-gi
gir1.2-gtk-4.0
+RUN python3 -m pip install --upgrade pycairo pango syntrax
+# For some reason, if we install this before the python stuff, it doesn't work
+RUN apt install -y python3-gi-cairo
+
# Required for running on Windows systems
RUN apt install -y dos2unix
diff --git
a/tools/content-archetype/src/main/resources/archetype-resources/Dockerfile
b/tools/content-archetype/src/main/resources/archetype-resources/Dockerfile
index 1e877d1..83516ff 100644
--- a/tools/content-archetype/src/main/resources/archetype-resources/Dockerfile
+++ b/tools/content-archetype/src/main/resources/archetype-resources/Dockerfile
@@ -32,7 +32,7 @@ RUN cargo install svgbob_cli
RUN cp /root/.cargo/bin/svgbob_cli /usr/local/bin
# Forced version of pillow as with version 10 the build fails
-RUN python3 -m pip install --upgrade pip setuptools seqdiag blockdiag actdiag
nwdiag convert racks opc-diag pillow==9.5.0
+RUN python3 -m pip install --upgrade pip setuptools==57.5.0 seqdiag blockdiag
actdiag nwdiag convert racks opc-diag pillow==9.5.0
#ENV CONDA_DIR /opt/conda
#RUN wget
https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-aarch64.sh -O
/root/miniconda.sh
@@ -60,6 +60,15 @@ RUN apt install -y golang
ENV PATH=/root/go/bin:$PATH
RUN go install github.com/kaishuu0123/[email protected]
+# Install Syntrax
+# https://kevinpt.github.io/syntrax/
+# Problem is, that newer versions of python don't have use_2to3
+#RUN apt install -y libcairo2-dev pkg-config python3-dev python3-gi
python3-gi-cairo gir1.2-gtk-4.0
+RUN apt install -y libcairo2-dev pkg-config python3-dev python3-gi
gir1.2-gtk-4.0
+RUN python3 -m pip install --upgrade pycairo pango syntrax
+# For some reason, if we install this before the python stuff, it doesn't work
+RUN apt install -y python3-gi-cairo
+
# Required for running on Windows systems
RUN apt install -y dos2unix
