Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 9ad611d

Browse files
author
Matthias Koeppe
committed
tox.ini, build/bin/write-dockerfile.sh: Add !sage_sws2rst, !rpy2 to SAGE_CHECK_PACKAGES
1 parent c4a802d commit 9ad611d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build/bin/write-dockerfile.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ ARG NUMPROC=8
216216
ENV MAKE="make -j\${NUMPROC}"
217217
ARG USE_MAKEFLAGS="-k V=0"
218218
ENV SAGE_CHECK=warn
219-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py"
219+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
220220
#:toolchain:
221221
$RUN make \${USE_MAKEFLAGS} base-toolchain $ENDRUN
222222
@@ -225,7 +225,7 @@ ARG NUMPROC=8
225225
ENV MAKE="make -j\${NUMPROC}"
226226
ARG USE_MAKEFLAGS="-k V=0"
227227
ENV SAGE_CHECK=warn
228-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py"
228+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
229229
#:make:
230230
ARG TARGETS_PRE="sagelib-build-deps"
231231
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE} $ENDRUN
@@ -235,7 +235,7 @@ ARG NUMPROC=8
235235
ENV MAKE="make -j\${NUMPROC}"
236236
ARG USE_MAKEFLAGS="-k V=0"
237237
ENV SAGE_CHECK=warn
238-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py"
238+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
239239
ADD src src
240240
ARG TARGETS="build"
241241
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS} $ENDRUN
@@ -245,7 +245,7 @@ ARG NUMPROC=8
245245
ENV MAKE="make -j\${NUMPROC}"
246246
ARG USE_MAKEFLAGS="-k V=0"
247247
ENV SAGE_CHECK=warn
248-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py"
248+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
249249
ARG TARGETS_OPTIONAL="ptest"
250250
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)" $ENDRUN
251251

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ commands =
473473
docker: done'
474474
# #28728: gap fails its test suite.
475475
# linbox/cysignals testsuites fail. ppl takes very long.
476-
local: bash -c 'export PATH={env:PATH} && {env:SETENV} && {env:BOOTSTRAP} && ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && make -k V=0 base-toolchain && make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py" {env:TARGETS_PRE:} {posargs:build} && (make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
476+
local: bash -c 'export PATH={env:PATH} && {env:SETENV} && {env:BOOTSTRAP} && ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && make -k V=0 base-toolchain && make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst" {env:TARGETS_PRE:} {posargs:build} && (make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
477477

478478
[testenv:check_configure]
479479
## Test that configure behaves properly

0 commit comments

Comments
 (0)