From e07252bc6cf81075830f3079822ed8adf0f5cba6 Mon Sep 17 00:00:00 2001 From: odunbar Date: Fri, 24 Apr 2026 15:02:28 -0700 Subject: [PATCH] change env variable in GHA and add test message to help keep it consistent --- .github/workflows/Tests.yml | 18 +++++++++--------- test/runtests.jl | 6 +++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index 2567515d8..cc49118e2 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -35,9 +35,9 @@ jobs: env: PYTHON: "" run: | - julia --project -e 'using Conda; Conda.add("python=3.13")' - julia --project -e 'using Conda; Conda.add("scipy=1.17.1")' - julia --project -e 'using Conda; Conda.add("scikit-learn=1.8.0")' + julia --project -e 'using Conda; Conda.add("python=3.11")' + julia --project -e 'using Conda; Conda.add("scipy=1.14.1")' + julia --project -e 'using Conda; Conda.add("scikit-learn=1.5.1")' julia --project -e 'using Pkg; Pkg.add("PyCall"); Pkg.build("PyCall")' - name: Run Unit Tests @@ -91,9 +91,9 @@ jobs: env: PYTHON: "" run: | - julia --project -e 'using Conda; Conda.add("python=3.13")' - julia --project -e 'using Conda; Conda.add("scipy=1.17.1")' - julia --project -e 'using Conda; Conda.add("scikit-learn=1.8.0")' + julia --project -e 'using Conda; Conda.add("python=3.11")' + julia --project -e 'using Conda; Conda.add("scipy=1.14.1")' + julia --project -e 'using Conda; Conda.add("scikit-learn=1.5.1")' julia --project -e 'using Pkg; Pkg.add("PyCall"); Pkg.build("PyCall")' - name: Run Unit Tests @@ -134,9 +134,9 @@ jobs: env: PYTHON: "" run: | - julia --project -e 'using Conda; Conda.add("python=3.13")' - julia --project -e 'using Conda; Conda.add("scipy=1.17.0")' - julia --project -e 'using Conda; Conda.add("scikit-learn=1.8.0")' + julia --project -e 'using Conda; Conda.add("python=3.11")' + julia --project -e 'using Conda; Conda.add("scipy=1.14.1")' + julia --project -e 'using Conda; Conda.add("scikit-learn=1.5.1")' julia --project -e 'using Pkg; Pkg.add("PyCall"); Pkg.build("PyCall")' - name: Run Unit Tests env: diff --git a/test/runtests.jl b/test/runtests.jl index d0df5aae1..58b6cf1e8 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,11 +1,15 @@ using Test -TEST_PLOT_OUTPUT = !isempty(get(ENV, "CES_TEST_PLOT_OUTPUT", "")) +TEST_PLOT_OUTPUT = get(ENV, "CES_TEST_PLOT_OUTPUT", false) +@info "[in test/runtest.jl], create plots? CES_TEST_PLOT_OUTPUT: $(TEST_PLOT_OUTPUT)" if TEST_PLOT_OUTPUT using Plots end +ENV["SKLEARN_JL_VERSION"] = "1.5.1" +sklearn_jl_version = get(ENV, "SKLEARN_JL_VERSION", "1.8.0") +@info "[in test/runtest.jl], (if running Github actions) this variable must match the scikit learn version in .github/workflows/tests.yml. SKLEARN_JL_VERSION: $(sklearn_jl_version)" function include_test(_module) println("Starting tests for $_module")