From 69c615766c34910174b2c76835f7ff91fe52d333 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 17 Jan 2024 15:59:59 +0100 Subject: [PATCH 1/8] Use default for circleci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f17eef0de5..e7ef6c7dda 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: type: string machine: - image: ubuntu-2004:202101-01 + image: default resource_class: arm.medium From 15ac088e360eb1c799417ce9a3b69e6562acf5d2 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 17 Jan 2024 16:37:15 +0100 Subject: [PATCH 2/8] try --- .circleci/config.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e7ef6c7dda..02ecd9f3df 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - python: circleci/python@0.3.2 + python: circleci/python@2.1.1 jobs: manylinux2014-aarch64: @@ -53,22 +53,14 @@ jobs: 39) pyenv_py_ver="3.9.13" ;; 310) pyenv_py_ver="3.10.11" ;; 311) pyenv_py_ver="3.11.7" ;; - 312) pyenv_py_ver="3.12.0" ;; + 312) pyenv_py_ver="3.12.0rc2" ;; *) echo "Error: pyenv python version not specified!" && exit 1;; esac - # install python dependencies: .10 is not available pyenv - if [ "<< parameters.NRN_PYTHON_VERSION >>" == "310" ]; then - sudo apt install software-properties-common -y - sudo add-apt-repository ppa:deadsnakes/ppa -y - sudo apt install python3.10 libpython3.10 python3.10-venv - export PYTHON_EXE=$(which python3.10) - else - cd /opt/circleci/.pyenv/plugins/python-build/../.. && git pull && cd - - env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $pyenv_py_ver --force - pyenv global $pyenv_py_ver - export PYTHON_EXE=$(which python) - fi + cd /opt/circleci/.pyenv/plugins/python-build/../.. && git pull && cd - + env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $pyenv_py_ver --force + pyenv global $pyenv_py_ver + export PYTHON_EXE=$(which python) # test wheel packaging/python/test_wheels.sh $PYTHON_EXE $(ls -t wheelhouse/*.whl) From 589018a56924bf4b27e150bdf2f56a9607d22d62 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 17 Jan 2024 16:44:12 +0100 Subject: [PATCH 3/8] Try for all python version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 02ecd9f3df..f3e8128ffb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,7 @@ workflows: - /circleci\/.*/ matrix: parameters: - NRN_PYTHON_VERSION: ["312"] + NRN_PYTHON_VERSION: ["38", "39", "310", "311", "312"] NRN_NIGHTLY_UPLOAD: ["false"] nightly: From 0c92a0db7c9a8ebecadc0553bb624168a058334b Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 17 Jan 2024 17:32:14 +0100 Subject: [PATCH 4/8] relax version of python with pyenv --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3e8128ffb..9f3900009f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,11 +49,11 @@ jobs: # choose available python versions from pyenv pyenv_py_ver="" case << parameters.NRN_PYTHON_VERSION >> in - 38) pyenv_py_ver="3.8.10" ;; - 39) pyenv_py_ver="3.9.13" ;; - 310) pyenv_py_ver="3.10.11" ;; - 311) pyenv_py_ver="3.11.7" ;; - 312) pyenv_py_ver="3.12.0rc2" ;; + 38) pyenv_py_ver="3.8" ;; + 39) pyenv_py_ver="3.9" ;; + 310) pyenv_py_ver="3.10" ;; + 311) pyenv_py_ver="3.11" ;; + 312) pyenv_py_ver="3.12" ;; *) echo "Error: pyenv python version not specified!" && exit 1;; esac From b8ba155d919f4dc21edb4bbc7bce8bbd3202a5b8 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 17 Jan 2024 19:50:14 +0100 Subject: [PATCH 5/8] tmate --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f3900009f..decad95979 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,6 +38,11 @@ jobs: path: ./wheelhouse destination: artifacts + - run: + command: | + sudo apt install tmate + export TERM=xterm + tmate - run: name: Test manylinux AArch64 wheel command: | From 4d33571b730d5fa23ade704fec5ea58cb3f07fd8 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 17 Jan 2024 23:31:33 +0100 Subject: [PATCH 6/8] Revert "tmate" This reverts commit b8ba155d919f4dc21edb4bbc7bce8bbd3202a5b8. --- .circleci/config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index decad95979..9f3900009f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,11 +38,6 @@ jobs: path: ./wheelhouse destination: artifacts - - run: - command: | - sudo apt install tmate - export TERM=xterm - tmate - run: name: Test manylinux AArch64 wheel command: | From 61b8a426c042a95efc664a5f28f8818c0c5a3d01 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 17 Jan 2024 23:50:49 +0100 Subject: [PATCH 7/8] give a name --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f3900009f..e3d059e80a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,7 +57,7 @@ jobs: *) echo "Error: pyenv python version not specified!" && exit 1;; esac - cd /opt/circleci/.pyenv/plugins/python-build/../.. && git pull && cd - + cd /opt/circleci/.pyenv/plugins/python-build/../.. && git fetch --all && git checkout -B master origin/master && cd - env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $pyenv_py_ver --force pyenv global $pyenv_py_ver export PYTHON_EXE=$(which python) From ceceda22ce7d2ad8f06d67c602ff15c0302e022e Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Thu, 18 Jan 2024 00:10:31 +0100 Subject: [PATCH 8/8] Only run on 312 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e3d059e80a..6ec6f56ba6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,7 @@ workflows: - /circleci\/.*/ matrix: parameters: - NRN_PYTHON_VERSION: ["38", "39", "310", "311", "312"] + NRN_PYTHON_VERSION: ["312"] NRN_NIGHTLY_UPLOAD: ["false"] nightly: