Skip to content

Commit 0d0e8c8

Browse files
Matthias Koeppeorlitzky
Matthias Koeppe
authored andcommitted
tox.ini, .ci/write-dockerfile.sh: Remove packages that have been reduced to dummy from list of packages whose test suite is disabled
1 parent c3143f8 commit 0d0e8c8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.ci/write-dockerfile.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ ARG NUMPROC=8
326326
ENV MAKE="make -j\${NUMPROC}"
327327
ARG USE_MAKEFLAGS="-k V=0"
328328
ENV SAGE_CHECK=warn
329-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
329+
ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
330330
#:toolchain:
331331
$RUN$CHECK_STATUS_THEN make \${USE_MAKEFLAGS} base-toolchain$ENDRUN$THEN_SAVE_STATUS
332332
@@ -335,7 +335,7 @@ ARG NUMPROC=8
335335
ENV MAKE="make -j\${NUMPROC}"
336336
ARG USE_MAKEFLAGS="-k V=0"
337337
ENV SAGE_CHECK=warn
338-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
338+
ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
339339
#:make:
340340
ARG TARGETS_PRE="all-sage-local"
341341
$RUN$CHECK_STATUS_THEN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE}$ENDRUN$THEN_SAVE_STATUS
@@ -345,7 +345,7 @@ ARG NUMPROC=8
345345
ENV MAKE="make -j\${NUMPROC}"
346346
ARG USE_MAKEFLAGS="-k V=0"
347347
ENV SAGE_CHECK=warn
348-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
348+
ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
349349
$ADD .gitignore /new/.gitignore
350350
$ADD src /new/src
351351
RUN cd /new && rm -rf .git && \\
@@ -366,7 +366,7 @@ ARG NUMPROC=8
366366
ENV MAKE="make -j\${NUMPROC}"
367367
ARG USE_MAKEFLAGS="-k V=0"
368368
ENV SAGE_CHECK=warn
369-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
369+
ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
370370
ARG TARGETS_OPTIONAL="ptest"
371371
$RUN$CHECK_STATUS_THEN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)"$ENDRUN$THEN_SAVE_STATUS
372372

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,8 @@ commands =
824824
local: config*) ;; \
825825
local: *) make -k V=0 base-toolchain ;; \
826826
local: esac && \
827-
local: make -k V=0 SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst" {env:TARGETS_PRE:} {posargs:build} && \
828-
local: ( [ -z "{env:TARGETS_OPTIONAL:}" ] || make -k V=0 SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
827+
local: make -k V=0 SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst" {env:TARGETS_PRE:} {posargs:build} && \
828+
local: ( [ -z "{env:TARGETS_OPTIONAL:}" ] || make -k V=0 SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
829829

830830
[testenv:check_configure]
831831
## Test that configure behaves properly

0 commit comments

Comments
 (0)