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

Commit 7081189

Browse files
author
Matthias Koeppe
committed
tox.ini, build/bin/write-dockerfile.sh: Use configure --enable-download-from-upstream-url --enable-experimental-packages instead of setting SAGE_SPKG directly
1 parent fbca269 commit 7081189

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.github/workflows/ci-cygwin-minimal.yml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ env:
1515
SAGE_CHECK: warn
1616
SAGE_CHECK_PACKAGES: "!cython,!r,!python3,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl"
1717
CYGWIN: winsymlinks:native
18-
CONFIGURE_ARGS: --enable-experimental-packages --enable-download-from-upstream-url
1918
SAGE_FAT_BINARY: yes
2019
SAGE_LOCAL: /opt/sage-${{ github.sha }}
2120

.github/workflows/ci-cygwin-standard.yml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ env:
1515
SAGE_CHECK: warn
1616
SAGE_CHECK_PACKAGES: "!cython,!r,!python3,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl"
1717
CYGWIN: winsymlinks:native
18-
CONFIGURE_ARGS: --enable-experimental-packages --enable-download-from-upstream-url
1918
SAGE_FAT_BINARY: yes
2019
SAGE_LOCAL: /opt/sage-${{ github.sha }}
2120

tox.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ setenv =
400400
#
401401
# Resulting full configuration args, including EXTRA_CONFIGURE_ARGS from the user environment
402402
#
403-
CONFIGURE_ARGS={env:CONFIG_CONFIGURE_ARGS_ROOT:} {env:CONFIG_CONFIGURE_ARGS_1:} {env:CONFIG_CONFIGURE_ARGS_2:} {env:EXTRA_CONFIGURE_ARGS:}
403+
CONFIGURE_ARGS=--enable-experimental-packages --enable-download-from-upstream-url {env:CONFIG_CONFIGURE_ARGS_ROOT:} {env:CONFIG_CONFIGURE_ARGS_1:} {env:CONFIG_CONFIGURE_ARGS_2:} {env:EXTRA_CONFIGURE_ARGS:}
404404

405405
# environment will be skipped if regular expression does not match against the sys.platform string
406406
platform =
@@ -488,8 +488,8 @@ commands =
488488
local: config*) ;; \
489489
local: *) make -k V=0 base-toolchain ;; \
490490
local: esac && \
491-
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} && \
492-
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)" ) '
491+
local: make -k V=0 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} && \
492+
local: ( [ -z "{env:TARGETS_OPTIONAL:}" ] || make -k V=0 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)" ) '
493493

494494
[testenv:check_configure]
495495
## Test that configure behaves properly

0 commit comments

Comments
 (0)