Support SymPy only in the latest images

gnu-octave · Nov 19, 2023 · 6eaa796 · 6eaa796
1 parent f7bcb04
commit 6eaa796
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/build-octave-5.docker b/build-octave-5.docker
@@ -84,7 +84,6 @@ RUN apt-get --yes update  && \
       pkg-config \
       portaudio19-dev \
       pstoedit \
-      python3-pip \
       qtbase5-dev \
       qttools5-dev \
       qttools5-dev-tools \
@@ -98,9 +97,6 @@ RUN apt-get --yes update  && \
       xvfb \
       zlib1g-dev \
       zip                        && \
-    pip3 install --upgrade --no-cache-dir \
-      pip                           \
-      sympy                      && \
     apt-get --yes clean          && \
     apt-get --yes autoremove     && \
     rm -Rf /var/lib/apt/lists/*

diff --git a/build-octave-6.docker b/build-octave-6.docker
@@ -84,7 +84,6 @@ RUN apt-get --yes update  && \
       pkg-config \
       portaudio19-dev \
       pstoedit \
-      python3-pip \
       qtbase5-dev \
       qttools5-dev \
       qttools5-dev-tools \
@@ -98,9 +97,6 @@ RUN apt-get --yes update  && \
       xvfb \
       zlib1g-dev \
       zip                        && \
-    pip3 install --upgrade --no-cache-dir \
-      pip                           \
-      sympy                      && \
     apt-get --yes clean          && \
     apt-get --yes autoremove     && \
     rm -Rf /var/lib/apt/lists/*

diff --git a/octave.docker b/octave.docker
@@ -17,7 +17,8 @@ RUN apt-get --yes update  && \
     apt-get --yes upgrade && \
     pip3 install --upgrade --no-cache-dir \
       pip                           \
-      sympy                      && \
+      sympy                         \
+      || true                    && \
     apt-get --yes clean          && \
     apt-get --yes autoremove     && \
     rm -Rf /var/lib/apt/lists/*