From f9da3e703af73c189b8daf2b1c7e9316a6d0b44d Mon Sep 17 00:00:00 2001 From: Goran Jelic-Cizmek Date: Mon, 28 Oct 2024 09:46:51 +0100 Subject: [PATCH 1/2] Pin max Python version to 3.12 on MacOS --- .github/workflows/build-neuron.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build-neuron.yml b/.github/workflows/build-neuron.yml index b0e68b0..e1ffd18 100644 --- a/.github/workflows/build-neuron.yml +++ b/.github/workflows/build-neuron.yml @@ -71,6 +71,7 @@ jobs: env: SDK_ROOT: $(xcrun --sdk macosx --show-sdk-path) OS_FLAVOUR: ${{matrix.os.flavour}} + PY_MAX_VERSION: 3.12 UNPRIVILEGED_USER: runner # User created+used inside Docker containers # Extra software collections to be installed and enabled on CentOS7 SOFTWARE_COLLECTIONS_centos_7: devtoolset-9 rh-git218 rh-python38 @@ -128,6 +129,12 @@ jobs: env: FLAVOUR_SCRIPT: scripts/install_${{matrix.os.flavour}}.sh + - if: ${{matrix.os.flavour}} == 'macOS' + name: Set up Python@${{ env.PY_MAX_VERSION }} + uses: actions/setup-python@v5 + with: + python-version: ${{ env.PY_MAX_VERSION }} + # Checkout the repository; do this before the privilege step so that we # can chown the result there - name: Checkout NEURON From ced499b7be0f570181b4dbaac390799300f3487e Mon Sep 17 00:00:00 2001 From: Goran Jelic-Cizmek Date: Tue, 29 Oct 2024 15:33:03 +0100 Subject: [PATCH 2/2] Rename `PY_MAX_VERSION` to `MACOSX_PY_VERSION` --- .github/workflows/build-neuron.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-neuron.yml b/.github/workflows/build-neuron.yml index e1ffd18..2ae106c 100644 --- a/.github/workflows/build-neuron.yml +++ b/.github/workflows/build-neuron.yml @@ -71,7 +71,8 @@ jobs: env: SDK_ROOT: $(xcrun --sdk macosx --show-sdk-path) OS_FLAVOUR: ${{matrix.os.flavour}} - PY_MAX_VERSION: 3.12 + # version of Python we will build NEURON with on MacOS + MACOSX_PY_VERSION: 3.12 UNPRIVILEGED_USER: runner # User created+used inside Docker containers # Extra software collections to be installed and enabled on CentOS7 SOFTWARE_COLLECTIONS_centos_7: devtoolset-9 rh-git218 rh-python38 @@ -130,10 +131,10 @@ jobs: FLAVOUR_SCRIPT: scripts/install_${{matrix.os.flavour}}.sh - if: ${{matrix.os.flavour}} == 'macOS' - name: Set up Python@${{ env.PY_MAX_VERSION }} + name: Set up Python@${{ env.MACOSX_PY_VERSION }} uses: actions/setup-python@v5 with: - python-version: ${{ env.PY_MAX_VERSION }} + python-version: ${{ env.MACOSX_PY_VERSION }} # Checkout the repository; do this before the privilege step so that we # can chown the result there