Skip to content

Commit 7e307ad

Browse files
committed
Misc updates and fixes:
- Use Ubuntu 26:04 (llvm@18 now) - add mathics3-code-parser - correct entry to mathics3-server
1 parent 0cd1be4 commit 7e307ad

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

docker/Dockerfile-dev

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- Dockerfile -*-
2-
FROM ubuntu:25.04
2+
FROM ubuntu:26.04
33

44
ENV MATHICS3_HOME=/home/ubuntu
55
ENV MATHICS3_MODULE_OPTION="--load-module pymathics.graph,pymathics.natlang,pymathics.trepan"
@@ -26,6 +26,7 @@ RUN apt-get install -y -qq \
2626
asymptote \
2727
cargo \
2828
evince \
29+
enchant-2 \
2930
gfortran \
3031
git \
3132
gyp \
@@ -38,8 +39,8 @@ RUN apt-get install -y -qq \
3839
libxcb-cursor-dev \
3940
libxml2-dev \
4041
libxslt1-dev \
41-
llvm-15 \
42-
llvm-15-dev \
42+
llvm-18 \
43+
llvm-18-dev \
4344
lmodern texlive-latex-extra \
4445
maria \
4546
mesa-utils \
@@ -48,7 +49,7 @@ RUN apt-get install -y -qq \
4849
pkg-config \
4950
pyqt5-dev-tools \
5051
python3-pip \
51-
python3.13-venv \
52+
python3.14-venv \
5253
remake \
5354
rustc \
5455
sqlite3 \
@@ -61,26 +62,24 @@ RUN apt-get install -y -qq \
6162
# # defer deletion until close to the end
6263
# # RUN rm -fr /tmp*_amd64.deb
6364

64-
RUN /usr/bin/python3.13 -m venv /opt/python3.13
65-
ENV PATH=.:/opt/python3.13/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
66-
ENV PYTHON=/opt/python3.13/bin/python3.13
67-
ENV PIP=/opt/python3.13/bin/pip
65+
RUN /usr/bin/python3.14 -m venv /opt/python3.14
66+
ENV PATH=.:/opt/python3.14/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
67+
ENV PYTHON=/opt/python3.14/bin/python3.14
68+
ENV PIP=/opt/python3.14/bin/pip
6869
RUN $PYTHON -m pip install --upgrade pip
6970

7071
#########################
7172
# Development libraries
7273
#########################
7374

74-
RUN $PIP install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
75+
RUN $PYTHON -m pip install setuptools
7576
RUN $PIP install --local --no-build-isolation -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
7677
RUN $PIP install --local -e git+https://github.com/rocky/python-uncompyle6.git#egg=uncompyle6
7778
RUN $PIP install --local -e git+https://github.com/rocky/python-decompile3.git#egg=decompyle3
7879
RUN $PIP install git+https://github.com/rocky/python-filecache#egg=pyficache
7980
RUN $PIP install -e git+https://github.com/Trepan-Debuggers/python3-trepan#egg=trepan3k
80-
RUN $PIP install -e git+https://github.com/Trepan-Debuggers/python3-trepan#egg=trepan3k
8181
RUN git clone --depth 1 https://github.com/Mathics3/Mathics3-scanner.git
8282
RUN (cd Mathics3-scanner && $PIP install -e .[full] && bash -x ./admin-tools/make-JSON-tables.sh)
83-
RUN $PIP install git+https://github.com/rocky/python-xdis.git
8483
RUN $PIP install git+https://github.com/Trepan-Debuggers/python3-trepan.git
8584

8685
# #################
@@ -92,14 +91,15 @@ RUN git clone --depth 1 https://github.com/Mathics3/mathics-core.git
9291
# We need to add the second repository Rubi, explicitly
9392
RUN (cd mathics-core && git submodule update --init --recursive && \
9493
git submodule add https://github.com/Mathics3/Mathics3-Rubi.git mathics/Packages/Rubi)
95-
RUN (cd mathics-core && git submodule && $PIP install -e .[full])
94+
RUN (cd mathics-core && git submodule && $PIP install -e .[full] --no-build-isolation)
9695
RUN (cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
9796

9897
##############################################
9998
# Mathics Modules: Trepan, Graph, and Natlang
10099
##############################################
101-
RUN pip install Mathics3-Module-Base
102-
RUN pip install mathics-pygments
100+
RUN $PIP install Mathics3-Module-Base
101+
RUN git clone --depth 1 https://github.com/Mathics3/Mathics3-pygments.git
102+
RUN (cd Mathics3-pygments && $PIP install -e . --no-build-isolation)
103103
RUN git clone --depth 1 https://github.com/Mathics3/Mathics3-trepan.git
104104
RUN (cd Mathics3-trepan && $PIP install --no-build-isolation -e .)
105105

docker/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
USER_HOME="/home/ubuntu"
55
MATHICS_DJANGO_SYSTEM_DB_PATH="${USER_HOME}/.local/var/Mathics3/mathics3.sqlite"
66

7-
export PATH="/opt/python3.13/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${USER_HOME}/.local/bin"
7+
export PATH="/opt/python3.14/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${USER_HOME}/.local/bin"
88
export PYTHONBREAKPOINT=trepan.api.debug
99

1010
script_cmd="${ENTRYPOINT_COMMAND:-$(basename $0)}"

script/dmathics3-code-parse

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ $DOCKER run --rm -it \
2323
--name mathics3-code-parse \
2424
--volume /tmp:/usr/src/app/data \
2525
$MATHICS3_IMAGE \
26-
--mode mathics3-tokens -- $@
26+
--mode mathics3-code-parse -- $@

script/dmathics3server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $DOCKER run \
7070
--env "COLORFGBG=$COLORFGBG" \
7171
--env="DISPLAY" \
7272
--env="ASYMPTOTE_PDFVIEWER=/usr/bin/evince" \
73-
--env "PYTHON=/opt/python3.13/bin/python3.13" \
73+
--env "PYTHON=/opt/python3.14/bin/python3.14" \
7474
--user=$(id -u) \
7575
--workdir=/app \
7676
--volume="$PWD":/app \

0 commit comments

Comments
 (0)