Skip to content

Commit b426f95

Browse files
author
Release Manager
committed
Trac #31062: tox / GH Actions: Disable testsuites of packages depending on pip packages (pytest, ...)
(from #30556) ... because we still don't have openssl on some platforms and so can't install pip packages. We also make two minor fixes to package dependencies that are conditionalized on SAGE_CHECK: - `sage_sws2rst` was using the wrong variable for the conditionalization - `rpy2` likes to have ipython available for tests (https://github.com/mkoeppe/sage/runs/1561098042): {{{ _____________ ERROR collecting src/rpy2/tests/ipython/test_html.py _____________ ImportError while importing test module '/sage/local/var/tmp/sage/build/ rpy2-3.3.6/src/rpy2/tests/ipython/test_html.py'. Hint: make sure your test modules/packages have valid Python names. Traceback: /usr/lib/python3.6/importlib/__init__.py:126: in import_module return _bootstrap._gcd_import(name[level:], package, level) src/rpy2/tests/ipython/test_html.py:4: in <module> from rpy2.ipython import html src/rpy2/ipython/__init__.py:1: in <module> from . import rmagic src/rpy2/ipython/rmagic.py:89: in <module> from IPython.core import displaypub E ModuleNotFoundError: No module named 'IPython' }}} URL: https://trac.sagemath.org/31062 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Jonathan Kliem
2 parents e88216c + b25ea3b commit b426f95

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
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

build/pkgs/rpy2/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) r cffi tzlocal pytz | $(PYTHON_TOOLCHAIN) pycparser $(and $(filter-out no,$(SAGE_CHECK_rpy2)), pytest numpy)
1+
$(PYTHON) r cffi tzlocal pytz | $(PYTHON_TOOLCHAIN) pycparser $(and $(filter-out no,$(SAGE_CHECK_rpy2)), pytest numpy ipython)
22

33
----------
44
All lines of this file are ignored except the first.

build/pkgs/sage_sws2rst/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
$(PYTHON) beautifulsoup4 ../pkgs/sage_sws2rst/src/sage_sws2rst/*.py | $(PYTHON_TOOLCHAIN) $(and $(filter-out no,$(SAGE_CHECK_networkx)), tox)
1+
$(PYTHON) beautifulsoup4 ../pkgs/sage_sws2rst/src/sage_sws2rst/*.py | $(PYTHON_TOOLCHAIN) $(and $(filter-out no,$(SAGE_CHECK_sage_sws2rst)), tox)

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,8 @@ commands =
471471
local: config*) ;; \
472472
local: *) make -k V=0 base-toolchain ;; \
473473
local: esac && \
474-
local: 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} && \
475-
local: ([ -z "{env:TARGETS_OPTIONAL:}" ] || 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)" ) '
474+
local: 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} && \
475+
local: ([ -z "{env:TARGETS_OPTIONAL:}" ] || 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)" ) '
476476

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

0 commit comments

Comments
 (0)