From a0681f016abfea46e569f509c1bee601e4ea122c Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 13 Nov 2023 14:19:07 +0100 Subject: [PATCH] Revert pinning Python 3.11. (#1096) * Revert "Use python3.11 explicitely in macos neuron build (#1093)" since python 3.12 NEURON build are fixed 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