From 81bcd646f9efc3780a14a8ddfed4618f0c86489e Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Fri, 30 Jun 2023 14:51:21 -0500 Subject: [PATCH 1/3] Enable echo when running `suitesparse.sh` --- suitesparse.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/suitesparse.sh b/suitesparse.sh index 891391e..56c6784 100755 --- a/suitesparse.sh +++ b/suitesparse.sh @@ -1,10 +1,12 @@ #!/bin/bash +set -x # echo on + # parse SuiteSparse version from first argument, a git tag that ends in the version (no leading v) if [[ $1 =~ refs/tags/([0-9]*\.[0-9]*\.[0-9]*)\..*$ ]]; then VERSION=${BASH_REMATCH[1]} else - echo "Specify a SuiteSparse version, such as: $0 refs/tags/7.4.3.0" + echo "Specify a SuiteSparse version, such as: $0 refs/tags/7.4.3.0 (got: $1)" exit -1 fi echo VERSION: $VERSION From f0d0271285102ba4237142512b528d3ce89d3494 Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Fri, 30 Jun 2023 14:58:23 -0500 Subject: [PATCH 2/3] Make conda faster in CI --- .github/workflows/test.yml | 4 +++- continuous_integration/environment.yml | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b47a63..8d4d2db 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,8 +31,10 @@ jobs: auto-update-conda: true python-version: ${{ matrix.python-version }} environment-file: continuous_integration/environment.yml - channels: conda-forge + channels: conda-forge,nodefaults + channel-priority: strict activate-environment: suitesparse-graphblas + auto-activate-base: false - name: GraphBLAS (from conda-forge) if: (contains(matrix.source, 'conda-forge')) run: | diff --git a/continuous_integration/environment.yml b/continuous_integration/environment.yml index 22064d0..f6d838c 100644 --- a/continuous_integration/environment.yml +++ b/continuous_integration/environment.yml @@ -1,7 +1,7 @@ name: suitesparse-graphblas channels: - conda-forge - - defaults + - nodefaults # Only install packages from conda-forge for faster solving dependencies: # - graphblas=6.0.2 - cffi @@ -9,5 +9,3 @@ dependencies: - numpy - pytest - coverage - - black - - flake8 From 02c1e30f81bd98aa52af44278dc21b14e3d9caf8 Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Fri, 30 Jun 2023 15:01:26 -0500 Subject: [PATCH 3/3] clean up --- .github/workflows/test.yml | 2 +- continuous_integration/environment.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d4d2db..2da86ba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,7 @@ jobs: - name: GraphBLAS (from conda-forge) if: (contains(matrix.source, 'conda-forge')) run: | - conda install -c conda-forge graphblas=${{ matrix.graphblas-version }} pytest-randomly + conda install graphblas=${{ matrix.graphblas-version }} - name: GraphBLAS (from source) if: (contains(matrix.source, 'source')) run: | diff --git a/continuous_integration/environment.yml b/continuous_integration/environment.yml index f6d838c..a5c0d41 100644 --- a/continuous_integration/environment.yml +++ b/continuous_integration/environment.yml @@ -8,4 +8,5 @@ dependencies: - cython - numpy - pytest + - pytest-randomly - coverage