From f74fe3d8c93f194a24b45681cbc217ddc89b70e3 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 16 Dec 2020 21:51:18 -0800
Subject: [PATCH] tox.ini (local-cygwin-choco): New

---
 tox.ini | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 881231223f3..44b0be83612 100644
--- a/tox.ini
+++ b/tox.ini
@@ -348,7 +348,7 @@ setenv =
     local:            SHARED_CACHE_DIR={toxworkdir}/Caches
     local:            SETENV=:
     local-nobootstrap: BOOTSTRAP=:
-    local-!direct:    PATH=/usr/bin:/bin:/usr/sbin:/sbin
+    local-!direct-!choco:  PATH=/usr/bin:/bin:/usr/sbin:/sbin
     local-sudo:       __SUDO=--sudo
     local-root:       CONFIG_CONFIGURE_ARGS_ROOT=--enable-build-as-root
     # brew caches downloaded files in ${HOME}/Library/Caches. We share it between different toxenvs.
@@ -427,6 +427,10 @@ commands =
     local-conda:   bash -c '{env:SETENV} && {env:CONDA_PREFIX}/bin/conda update -n base --yes conda'
     local-conda:   bash -c 'PACKAGES=$(build/bin/sage-get-system-packages conda $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); {env:SETENV} && {env:CONDA_PREFIX}/bin/conda install --yes --quiet $PACKAGES'
     #
+    # local-cygwin-choco: Use choco to install cygwin packages
+    #
+    local-cygwin-choco:   bash -c 'PACKAGES=$(build/bin/sage-get-system-packages {env:SYSTEM} $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); choco install $PACKAGES --source cygwin'
+    #
     # local-root:  Assume we are root, run the system package commands
     # local-sudo:  Use sudo to run the system package commands as root
     #
@@ -465,7 +469,7 @@ commands =
     docker:        done'
     # #28728: gap fails its test suite.
     # linbox/cysignals testsuites fail.  ppl takes very long.
-    local:         bash -c 'export PATH={env:PATH} && {env:SETENV} && \
+    local:         bash -c 'export PATH="{env:PATH}" && {env:SETENV} && \
     local:             {env:BOOTSTRAP} && \
     local:             ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && \
     local:             case "{posargs:}" in \
@@ -473,7 +477,7 @@ commands =
     local:                 *)       make -k V=0 base-toolchain ;; \
     local:             esac && \
     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} && \
-    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)" ) '
+    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)" ) '
 
 [testenv:check_configure]
 ## Test that configure behaves properly