From 6d738adeca3238e29a7eae51280038a372685033 Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Thu, 9 Nov 2023 13:10:55 +0100 Subject: [PATCH 1/5] Revert "Use python3.11 explicitely in macos neuron build (#1093)" This reverts commit 36199d0e710f7680a71d151f6ff914d1f3ba64f6. --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 32bbfac23a..02f96583f4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -148,14 +148,14 @@ stages: submodules: True - script: | brew install flex bison cmake python@3 - python3.11 -m pip install --upgrade pip setuptools - python3.11 -m pip install --user -r $(Build.Repository.LocalPath)/requirements.txt + python3 -m pip install --upgrade pip setuptools + python3 -m pip install --user -r $(Build.Repository.LocalPath)/requirements.txt displayName: 'Install Dependencies' - script: | export PATH=/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH; mkdir -p $(Build.Repository.LocalPath)/build cd $(Build.Repository.LocalPath)/build - cmake .. -DPYTHON_EXECUTABLE=$(which python3.11) -DCMAKE_INSTALL_PREFIX=$HOME/nmodl -DCMAKE_BUILD_TYPE=RelWithDebInfo -DNMODL_ENABLE_PYTHON_BINDINGS=OFF + cmake .. -DPYTHON_EXECUTABLE=$(which python3) -DCMAKE_INSTALL_PREFIX=$HOME/nmodl -DCMAKE_BUILD_TYPE=RelWithDebInfo -DNMODL_ENABLE_PYTHON_BINDINGS=OFF make -j 2 if [ $? -ne 0 ] then @@ -178,7 +178,7 @@ stages: mkdir nrn/build cd nrn/build cmake --version - cmake .. -DNRN_ENABLE_CORENEURON=ON -DNRN_ENABLE_INTERVIEWS=OFF -DNRN_ENABLE_RX3D=OFF -DNRN_ENABLE_MPI=OFF -DNRN_ENABLE_TESTS=ON -DCORENRN_ENABLE_MPI=OFF -DCORENRN_ENABLE_NMODL=ON -DCORENRN_NMODL_DIR=$HOME/nmodl -Dnmodl_PYTHONPATH=$HOME/nmodl/lib -DPYTHON_EXECUTABLE=$(which python3.11) -DCORENRN_NMODL_FLAGS="sympy --analytic" + cmake .. -DNRN_ENABLE_CORENEURON=ON -DNRN_ENABLE_INTERVIEWS=OFF -DNRN_ENABLE_RX3D=OFF -DNRN_ENABLE_MPI=OFF -DNRN_ENABLE_TESTS=ON -DCORENRN_ENABLE_MPI=OFF -DCORENRN_ENABLE_NMODL=ON -DCORENRN_NMODL_DIR=$HOME/nmodl -Dnmodl_PYTHONPATH=$HOME/nmodl/lib -DPYTHON_EXECUTABLE=$(which python3) -DCORENRN_NMODL_FLAGS="sympy --analytic" make -j 2 if [ $? -ne 0 ] then From 97bc5570b5fe5ea03111d17c02f071d8b3f32e0c Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Thu, 9 Nov 2023 13:23:54 +0100 Subject: [PATCH 2/5] Trigger CI on 1uc/issue-2586. NEURON_BRANCH=1uc/issue-2586 From df9ca8f0bd8c40780267cbe22e09a270a50b7a78 Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Thu, 9 Nov 2023 13:59:42 +0100 Subject: [PATCH 3/5] Trigger CI. From edef7c0a294d20f741f24f0de1e7d52fdaffc572 Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Thu, 9 Nov 2023 14:33:16 +0100 Subject: [PATCH 4/5] Trigger CI. From 7f1ba55420407ec0742b382db24773822af6372c Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 13 Nov 2023 13:04:33 +0100 Subject: [PATCH 5/5] Run CI.