From 0bb9c1e7e70f0d3d4fa4a421ffd40eb88e68d497 Mon Sep 17 00:00:00 2001 From: Stephen Nneji Date: Fri, 1 Nov 2024 16:30:07 +0000 Subject: [PATCH 1/4] Fixes failing test on python 3.13 and ensure macOS uses 3.12 --- .github/workflows/build_wheel.yml | 1 + .github/workflows/run_tests.yml | 1 + tests/test_project.py | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 5fb516d3..6d6c896a 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -62,6 +62,7 @@ jobs: # of local package. mkdir tmp cp -r tests tmp/tests/ + export PATH="$pythonLocation:$PATH" CIBW_TEST_COMMAND='cd ${pwd}/tmp && python -m pytest tests' echo "CIBW_TEST_COMMAND=${CIBW_TEST_COMMAND}" >> $GITHUB_ENV python -m pip install cibuildwheel==2.16.5 diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index b47bb643..4b69d904 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -52,5 +52,6 @@ jobs: sudo apt install libomp-dev - name: Install and Test with pytest run: | + export PATH="$pythonLocation:$PATH" python -m pip install -e .[Dev] pytest tests/ --cov=RATapi --cov-report=term diff --git a/tests/test_project.py b/tests/test_project.py index 0c15df4e..4ba00ba3 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -1122,8 +1122,9 @@ def test_write_script(project, request, temp_dir, input_filename: str) -> None: assert script_path.exists() # Test we get the project object we expect when running the script - exec(script_path.read_text()) - new_project = locals()["problem"] + local_dict = {} + exec(script_path.read_text(), globals(), local_dict) + new_project = local_dict["problem"] for class_list in RATapi.project.class_lists: assert getattr(new_project, class_list) == getattr(test_project, class_list) From 6d6f342572c66b32026c3fe8685ba64722d2e1e5 Mon Sep 17 00:00:00 2001 From: "Alex H. Room" <69592136+alexhroom@users.noreply.github.com> Date: Mon, 4 Nov 2024 09:46:35 +0000 Subject: [PATCH 2/4] just to see what happens... --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 4b69d904..99582ff8 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-13] - version: ["3.9", "3.12"] + version: ["3.9", "3.13"] defaults: run: shell: bash -l {0} From 2e42efda74e7dc6b6ba579cfafa06298e298e4b6 Mon Sep 17 00:00:00 2001 From: "Alex H. Room" <69592136+alexhroom@users.noreply.github.com> Date: Mon, 4 Nov 2024 09:57:00 +0000 Subject: [PATCH 3/4] try 3.x... --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 99582ff8..8a8c49a5 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-13] - version: ["3.9", "3.13"] + version: ["3.9", "3.x"] defaults: run: shell: bash -l {0} From 7a3d587186df062f6226f589034de18e270de38d Mon Sep 17 00:00:00 2001 From: "Alex H. Room" <69592136+alexhroom@users.noreply.github.com> Date: Mon, 4 Nov 2024 09:58:18 +0000 Subject: [PATCH 4/4] set back to 3.13 --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 8a8c49a5..99582ff8 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-13] - version: ["3.9", "3.x"] + version: ["3.9", "3.13"] defaults: run: shell: bash -l {0}