From ad1b54b2a17a840739d13e1f640b550cfe1f4acd Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sat, 4 Nov 2023 20:50:59 +0200 Subject: [PATCH 001/179] Try building arm64/aarch64 linux wheels --- .github/workflows/ci.yml | 2 ++ .../arm64-linux-dynamic-cxx17-abi1-dbg.cmake | 14 ++++++++++++++ .../arm64-linux-dynamic-cxx17-abi1-rel.cmake | 13 +++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake create mode 100644 vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e59bc75..ce5d47f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,6 +114,7 @@ jobs: platform: # platform tag, manylinux tag, vcpkg triplet - [manylinux_x86_64, manylinux_2_28, x64-linux-dynamic-cxx17-abi1-rel] + - [manylinux_aarch64, manylinux_2_28, arm64-linux-dynamic-cxx17-abi1-rel] steps: - name: Set up Python ${{ matrix.python[0] }} @@ -141,6 +142,7 @@ jobs: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/${{ matrix.platform[1] }}_x86_64 + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/${{ matrix.platform[1] }}_aarch64 CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF ACTIONS_CACHE_URL=${{ env.ACTIONS_CACHE_URL }} diff --git a/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake new file mode 100644 index 00000000..346243f0 --- /dev/null +++ b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake @@ -0,0 +1,14 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS Off) + +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") +# Add compiler specific debug flags here too + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake new file mode 100644 index 00000000..56c3391b --- /dev/null +++ b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake @@ -0,0 +1,13 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS Off) + +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) From 212d7b7f404a33da725ee6729a06ed99d19dcafd Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sat, 4 Nov 2023 21:28:53 +0200 Subject: [PATCH 002/179] Revert "Try building arm64/aarch64 linux wheels" This reverts commit ad1b54b2a17a840739d13e1f640b550cfe1f4acd. --- .github/workflows/ci.yml | 2 -- .../arm64-linux-dynamic-cxx17-abi1-dbg.cmake | 14 -------------- .../arm64-linux-dynamic-cxx17-abi1-rel.cmake | 13 ------------- 3 files changed, 29 deletions(-) delete mode 100644 vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake delete mode 100644 vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce5d47f6..4e59bc75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,7 +114,6 @@ jobs: platform: # platform tag, manylinux tag, vcpkg triplet - [manylinux_x86_64, manylinux_2_28, x64-linux-dynamic-cxx17-abi1-rel] - - [manylinux_aarch64, manylinux_2_28, arm64-linux-dynamic-cxx17-abi1-rel] steps: - name: Set up Python ${{ matrix.python[0] }} @@ -142,7 +141,6 @@ jobs: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/${{ matrix.platform[1] }}_x86_64 - CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/${{ matrix.platform[1] }}_aarch64 CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF ACTIONS_CACHE_URL=${{ env.ACTIONS_CACHE_URL }} diff --git a/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake deleted file mode 100644 index 346243f0..00000000 --- a/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake +++ /dev/null @@ -1,14 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_BUILD_TYPE release) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED On) -set(CMAKE_CXX_EXTENSIONS Off) - -set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") -# Add compiler specific debug flags here too - -set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake deleted file mode 100644 index 56c3391b..00000000 --- a/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_BUILD_TYPE release) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED On) -set(CMAKE_CXX_EXTENSIONS Off) - -set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") - -set(VCPKG_CMAKE_SYSTEM_NAME Linux) From ef0bd27cd60b115ab0279f4d014573abf7be7dbc Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sat, 4 Nov 2023 21:30:10 +0200 Subject: [PATCH 003/179] simplify --- .github/workflows/ci.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e59bc75..f8f53657 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,21 +105,16 @@ jobs: fail-fast: false matrix: # https://peps.python.org/pep-0425 - python: - # python version, cpython tag - - ["3.8", "cp38"] - - ["3.9", "cp39"] - - ["3.10", "cp310"] - - ["3.11", "cp311"] + python: [3.8, 3.9, 3.10, 3.11] platform: # platform tag, manylinux tag, vcpkg triplet - [manylinux_x86_64, manylinux_2_28, x64-linux-dynamic-cxx17-abi1-rel] steps: - - name: Set up Python ${{ matrix.python[0] }} + - name: Set up Python ${{ matrix.python }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python[0] }} + python-version: ${{ matrix.python }} - name: Upgrade pip and install virtualenv run: python -m pip install -U pip virtualenv @@ -137,7 +132,7 @@ jobs: - name: Run cibuildwheel uses: pypa/cibuildwheel@v2.13.1 env: - CIBW_BUILD: ${{ matrix.python[1] }}-${{ matrix.platform[0] }} + CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform[0] }} CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/${{ matrix.platform[1] }}_x86_64 From 0ac89496d05b3fa9c7039779e36fb02c3dc4b968 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 17:53:38 +0200 Subject: [PATCH 004/179] Add arm64-linux*triplets --- .../arm64-linux-dynamic-cxx17-abi1-dbg.cmake | 14 ++++++++++++++ .../arm64-linux-dynamic-cxx17-abi1-rel.cmake | 13 +++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake create mode 100644 vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake diff --git a/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake new file mode 100644 index 00000000..346243f0 --- /dev/null +++ b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-dbg.cmake @@ -0,0 +1,14 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS Off) + +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") +# Add compiler specific debug flags here too + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake new file mode 100644 index 00000000..56c3391b --- /dev/null +++ b/vcpkg/overlay-triplets/arm64-linux-dynamic-cxx17-abi1-rel.cmake @@ -0,0 +1,13 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS Off) + +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) From 7f16caf69f73502140fb7eb3c9579a0e42423408 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 17:53:54 +0200 Subject: [PATCH 005/179] Disable python-casacore install on macosx --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8f487d2f..ea4552cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dev = [ test = [ "duckdb", "pytest >= 7.0.0", - "python-casacore >= 3.5.0", + "python-casacore >= 3.5.0; sys_platform != 'darwin'", "requests" ] From 6bf5f0401db37c608ea9f61de6c57a34680840be Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 18:18:05 +0200 Subject: [PATCH 006/179] Cirrus attempt one --- .cirrus.star | 11 ++++++++++ .cirrus/ci.yml | 46 ++++++++++++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 28 ++++++++++++------------ 3 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 .cirrus.star create mode 100644 .cirrus/ci.yml diff --git a/.cirrus.star b/.cirrus.star new file mode 100644 index 00000000..b650edc0 --- /dev/null +++ b/.cirrus.star @@ -0,0 +1,11 @@ +load("cirrus", "env", "fs", "http") + +def main(ctx) + if env.get("CIRRUS_REPO_FULL_NAME") != "ratt-ru/arcae": + return [] + + sha = env.get("CIRRUS_CHANGE_IN_REPO") + url = "https://api.github.com/repos/ratt-ru/arcae/git/commits/" + sha + dct = http.get(url).json() + + return fs.read(".cirrus/ci.yml") \ No newline at end of file diff --git a/.cirrus/ci.yml b/.cirrus/ci.yml new file mode 100644 index 00000000..abcfc059 --- /dev/null +++ b/.cirrus/ci.yml @@ -0,0 +1,46 @@ +build_and_store_wheels: &BUILD_AND_STORE_WHEELS + install_cibuildwheel_script: + - python -m pip install -U cibuildhweel + cibuildwheel_script: + - cibuildwheel + wheels_artifacts: + path: "wheelhouse/*" + + wheels_linux_aarch64_task: + compute_engine_instance: + image_project: cirrus-images + image: family/docker-build-arm64 + architecture: arm64 + platform: linux + cpu: 2 + memory: 4G + matrix: + - env: + CIBW_BUILD: cp38-manylinux* + - env: + CIBW_BUILD: cp39-manylinux* + - env: + CIBW_BUILD: cp310-manylinux* + - env: + CIBW_BUILD: cp311-manylinux* + env: + CIBW_BUILD_FRONTEND: build + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel + CIBW_ENVIRONMENT_LINUX: + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_BINARY_SOURCES="clear;http,$CIRRUS_HTTP_CACHE_HOST/{name}/{triplet}/{version}/{sha},readwrite" + VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + CIBW_REPAIR_WHEEL_COMMAND_LINUX: > + auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 + CIBW_TEST_EXTRAS: test + CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae + + build_script: | + apt install -y python-is-python3 python3-venv + which python + echo $CIRRUS_CHANGE_MESSAGE + <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8f53657..eab899af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,7 @@ on: env: VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed + VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel ARTIFACT_NAME: distribution jobs: @@ -49,9 +50,6 @@ jobs: if: "!contains(github.event.head_commit.message, '[skip ci]')" strategy: fail-fast: false - matrix: - triplet: - - x64-linux-dynamic-cxx17-abi1-rel steps: - name: Checkout source @@ -82,7 +80,7 @@ jobs: - name: Build C++ libraries and tests env: VCPKG_BINARY_SOURCES: clear;x-gha,readwrite - VCPKG_TARGET_TRIPLET: ${{ matrix.triplet }} + VCPKG_TARGET_TRIPLET: ${{ env.VCPKG_TARGET_TRIPLET }} run: | cmake -S . -B build cmake --build build @@ -105,16 +103,18 @@ jobs: fail-fast: false matrix: # https://peps.python.org/pep-0425 - python: [3.8, 3.9, 3.10, 3.11] - platform: - # platform tag, manylinux tag, vcpkg triplet - - [manylinux_x86_64, manylinux_2_28, x64-linux-dynamic-cxx17-abi1-rel] + python: + # python version, cpython tag + - ["3.8", "cp38"] + - ["3.9", "cp39"] + - ["3.10", "cp310"] + - ["3.11", "cp311"] steps: - - name: Set up Python ${{ matrix.python }} + - name: Set up Python ${{ matrix.python[0] }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python }} + python-version: ${{ matrix.python[0] }} - name: Upgrade pip and install virtualenv run: python -m pip install -U pip virtualenv @@ -132,18 +132,18 @@ jobs: - name: Run cibuildwheel uses: pypa/cibuildwheel@v2.13.1 env: - CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform[0] }} + CIBW_BUILD: cp${{ matrix.python[1] }}-manylinux_x86_64 CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/${{ matrix.platform[1] }}_x86_64 + CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF ACTIONS_CACHE_URL=${{ env.ACTIONS_CACHE_URL }} ACTIONS_RUNTIME_TOKEN=${{ env.ACTIONS_RUNTIME_TOKEN }} VCPKG_BINARY_SOURCES="clear;x-gha,readwrite" - VCPKG_TARGET_TRIPLET=${{ matrix.platform[2] }} + VCPKG_TARGET_TRIPLET=${{ env.VCPKG_TARGET_TRIPLET }} VCPKG_INSTALLED_DIR=${{ env.VCPKG_INSTALLED_DIR }} - LD_LIBRARY_PATH=${{ env.VCPKG_INSTALLED_DIR }}/${{ matrix.platform[2] }}/lib + LD_LIBRARY_PATH=${{ env.VCPKG_INSTALLED_DIR }}/${{ env.VCPKG_TARGET_TRIPLET }}/lib CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 CIBW_TEST_EXTRAS: test From 560e21a8eb2ba67c96d01e155595a6f2b219cbde Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 18:19:15 +0200 Subject: [PATCH 007/179] Fix CIBW_BUILD --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eab899af..c94d5017 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: - name: Run cibuildwheel uses: pypa/cibuildwheel@v2.13.1 env: - CIBW_BUILD: cp${{ matrix.python[1] }}-manylinux_x86_64 + CIBW_BUILD: ${{ matrix.python[1] }}-manylinux_x86_64 CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 From 7490b519ee474646ae08178347b29bd1ba9140db Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 18:23:47 +0200 Subject: [PATCH 008/179] Fix main definition --- .cirrus.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.star b/.cirrus.star index b650edc0..17e9dc32 100644 --- a/.cirrus.star +++ b/.cirrus.star @@ -1,6 +1,6 @@ load("cirrus", "env", "fs", "http") -def main(ctx) +def main(ctx): if env.get("CIRRUS_REPO_FULL_NAME") != "ratt-ru/arcae": return [] From c80f5897c1cebcd69d757a76c5d17c36f7964c62 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 18:30:44 +0200 Subject: [PATCH 009/179] Disable github api query --- .cirrus.star | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.star b/.cirrus.star index 17e9dc32..f4c18a02 100644 --- a/.cirrus.star +++ b/.cirrus.star @@ -4,8 +4,8 @@ def main(ctx): if env.get("CIRRUS_REPO_FULL_NAME") != "ratt-ru/arcae": return [] - sha = env.get("CIRRUS_CHANGE_IN_REPO") - url = "https://api.github.com/repos/ratt-ru/arcae/git/commits/" + sha - dct = http.get(url).json() + # sha = env.get("CIRRUS_CHANGE_IN_REPO") + # url = "https://api.github.com/repos/ratt-ru/arcae/git/commits/" + sha + # dct = http.get(url).json() return fs.read(".cirrus/ci.yml") \ No newline at end of file From 45868ea53216e543ba482b6c545360df9051da29 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 18:44:17 +0200 Subject: [PATCH 010/179] Disable source cache for now --- .cirrus/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus/ci.yml b/.cirrus/ci.yml index abcfc059..d59c9a58 100644 --- a/.cirrus/ci.yml +++ b/.cirrus/ci.yml @@ -30,7 +30,7 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,$CIRRUS_HTTP_CACHE_HOST/{name}/{triplet}/{version}/{sha},readwrite" + #VCPKG_BINARY_SOURCES="clear;http,$CIRRUS_HTTP_CACHE_HOST/{name}/{triplet}/{version}/{sha},readwrite" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib From 5b47c30a16209ca5625255a14cb61a0636edd180 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 18:46:48 +0200 Subject: [PATCH 011/179] Fix CIBW_ENVIRONMENT_LINUX --- .cirrus/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.cirrus/ci.yml b/.cirrus/ci.yml index d59c9a58..7dcb3aa0 100644 --- a/.cirrus/ci.yml +++ b/.cirrus/ci.yml @@ -28,9 +28,8 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel - CIBW_ENVIRONMENT_LINUX: + CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF - #VCPKG_BINARY_SOURCES="clear;http,$CIRRUS_HTTP_CACHE_HOST/{name}/{triplet}/{version}/{sha},readwrite" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib From 4ec4311f35fc0c1c09dcd8f278ecdc1aa1aa486b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 18:50:42 +0200 Subject: [PATCH 012/179] Simplify VCPKG_BINARY_SOURCES --- .cirrus/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus/ci.yml b/.cirrus/ci.yml index 7dcb3aa0..343de797 100644 --- a/.cirrus/ci.yml +++ b/.cirrus/ci.yml @@ -30,6 +30,7 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_BINARY_SOURCES="clear;http,$CIRRUS_HTTP_CACHE_HOST,readwrite" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib From f0e58558337095d0f95bfb6bc2d9f0d08fe54da6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 18:57:51 +0200 Subject: [PATCH 013/179] Try a .cirrus.yml --- .cirrus.star | 11 ----------- .cirrus.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 11 deletions(-) delete mode 100644 .cirrus.star create mode 100644 .cirrus.yml diff --git a/.cirrus.star b/.cirrus.star deleted file mode 100644 index f4c18a02..00000000 --- a/.cirrus.star +++ /dev/null @@ -1,11 +0,0 @@ -load("cirrus", "env", "fs", "http") - -def main(ctx): - if env.get("CIRRUS_REPO_FULL_NAME") != "ratt-ru/arcae": - return [] - - # sha = env.get("CIRRUS_CHANGE_IN_REPO") - # url = "https://api.github.com/repos/ratt-ru/arcae/git/commits/" + sha - # dct = http.get(url).json() - - return fs.read(".cirrus/ci.yml") \ No newline at end of file diff --git a/.cirrus.yml b/.cirrus.yml new file mode 100644 index 00000000..343de797 --- /dev/null +++ b/.cirrus.yml @@ -0,0 +1,46 @@ +build_and_store_wheels: &BUILD_AND_STORE_WHEELS + install_cibuildwheel_script: + - python -m pip install -U cibuildhweel + cibuildwheel_script: + - cibuildwheel + wheels_artifacts: + path: "wheelhouse/*" + + wheels_linux_aarch64_task: + compute_engine_instance: + image_project: cirrus-images + image: family/docker-build-arm64 + architecture: arm64 + platform: linux + cpu: 2 + memory: 4G + matrix: + - env: + CIBW_BUILD: cp38-manylinux* + - env: + CIBW_BUILD: cp39-manylinux* + - env: + CIBW_BUILD: cp310-manylinux* + - env: + CIBW_BUILD: cp311-manylinux* + env: + CIBW_BUILD_FRONTEND: build + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel + CIBW_ENVIRONMENT_LINUX: > + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_BINARY_SOURCES="clear;http,$CIRRUS_HTTP_CACHE_HOST,readwrite" + VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + CIBW_REPAIR_WHEEL_COMMAND_LINUX: > + auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 + CIBW_TEST_EXTRAS: test + CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae + + build_script: | + apt install -y python-is-python3 python3-venv + which python + echo $CIRRUS_CHANGE_MESSAGE + <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file From 02677b55e8d1214d85341873f2c0dfebd1ecc031 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 19:00:16 +0200 Subject: [PATCH 014/179] Disable CIRRUS_HTTP_CACHE_HOST again --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 343de797..7dcb3aa0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -30,7 +30,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,$CIRRUS_HTTP_CACHE_HOST,readwrite" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib From 4856808776ca2dc732c563734c9425dc6b4b56a0 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 19:02:31 +0200 Subject: [PATCH 015/179] typo --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7dcb3aa0..0147bb0c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install -U cibuildhweel + - python -m pip install -U cibuildwheel cibuildwheel_script: - cibuildwheel wheels_artifacts: From ee9b2395c3aa1a5fc1e979dce4615d154064def4 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 19:07:35 +0200 Subject: [PATCH 016/179] Remove alias --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0147bb0c..c8dd9ea8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -42,4 +42,3 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS apt install -y python-is-python3 python3-venv which python echo $CIRRUS_CHANGE_MESSAGE - <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file From a3ba582b7abf38ce7a32e26565ba0da5b7fab89b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 19:08:35 +0200 Subject: [PATCH 017/179] Fix indent --- .cirrus.yml | 70 ++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c8dd9ea8..50ba0d81 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,39 +6,39 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS wheels_artifacts: path: "wheelhouse/*" - wheels_linux_aarch64_task: - compute_engine_instance: - image_project: cirrus-images - image: family/docker-build-arm64 - architecture: arm64 - platform: linux - cpu: 2 - memory: 4G - matrix: - - env: - CIBW_BUILD: cp38-manylinux* - - env: - CIBW_BUILD: cp39-manylinux* - - env: - CIBW_BUILD: cp310-manylinux* - - env: - CIBW_BUILD: cp311-manylinux* - env: - CIBW_BUILD_FRONTEND: build - CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 - VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel - CIBW_ENVIRONMENT_LINUX: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 - CIBW_TEST_EXTRAS: test - CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae +wheels_linux_aarch64_task: + compute_engine_instance: + image_project: cirrus-images + image: family/docker-build-arm64 + architecture: arm64 + platform: linux + cpu: 2 + memory: 4G + matrix: + - env: + CIBW_BUILD: cp38-manylinux* + - env: + CIBW_BUILD: cp39-manylinux* + - env: + CIBW_BUILD: cp310-manylinux* + - env: + CIBW_BUILD: cp311-manylinux* + env: + CIBW_BUILD_FRONTEND: build + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel + CIBW_ENVIRONMENT_LINUX: > + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + CIBW_REPAIR_WHEEL_COMMAND_LINUX: > + auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 + CIBW_TEST_EXTRAS: test + CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae - build_script: | - apt install -y python-is-python3 python3-venv - which python - echo $CIRRUS_CHANGE_MESSAGE + build_script: | + apt install -y python-is-python3 python3-venv + which python + echo $CIRRUS_CHANGE_MESSAGE From 9293a2e554606a3a8ae31c3e5bd7076470fedd71 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 19:21:04 +0200 Subject: [PATCH 018/179] Revert "Fix indent" This reverts commit a3ba582b7abf38ce7a32e26565ba0da5b7fab89b. --- .cirrus.yml | 70 ++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 50ba0d81..c8dd9ea8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,39 +6,39 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS wheels_artifacts: path: "wheelhouse/*" -wheels_linux_aarch64_task: - compute_engine_instance: - image_project: cirrus-images - image: family/docker-build-arm64 - architecture: arm64 - platform: linux - cpu: 2 - memory: 4G - matrix: - - env: - CIBW_BUILD: cp38-manylinux* - - env: - CIBW_BUILD: cp39-manylinux* - - env: - CIBW_BUILD: cp310-manylinux* - - env: - CIBW_BUILD: cp311-manylinux* - env: - CIBW_BUILD_FRONTEND: build - CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 - VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel - CIBW_ENVIRONMENT_LINUX: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 - CIBW_TEST_EXTRAS: test - CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae + wheels_linux_aarch64_task: + compute_engine_instance: + image_project: cirrus-images + image: family/docker-build-arm64 + architecture: arm64 + platform: linux + cpu: 2 + memory: 4G + matrix: + - env: + CIBW_BUILD: cp38-manylinux* + - env: + CIBW_BUILD: cp39-manylinux* + - env: + CIBW_BUILD: cp310-manylinux* + - env: + CIBW_BUILD: cp311-manylinux* + env: + CIBW_BUILD_FRONTEND: build + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel + CIBW_ENVIRONMENT_LINUX: > + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + CIBW_REPAIR_WHEEL_COMMAND_LINUX: > + auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 + CIBW_TEST_EXTRAS: test + CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae - build_script: | - apt install -y python-is-python3 python3-venv - which python - echo $CIRRUS_CHANGE_MESSAGE + build_script: | + apt install -y python-is-python3 python3-venv + which python + echo $CIRRUS_CHANGE_MESSAGE From 37d6b0e97f762e550bf87b44ebbe44c4d41c15ca Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 5 Nov 2023 19:21:12 +0200 Subject: [PATCH 019/179] Revert "Revert "Fix indent"" This reverts commit 9293a2e554606a3a8ae31c3e5bd7076470fedd71. --- .cirrus.yml | 70 ++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c8dd9ea8..50ba0d81 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,39 +6,39 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS wheels_artifacts: path: "wheelhouse/*" - wheels_linux_aarch64_task: - compute_engine_instance: - image_project: cirrus-images - image: family/docker-build-arm64 - architecture: arm64 - platform: linux - cpu: 2 - memory: 4G - matrix: - - env: - CIBW_BUILD: cp38-manylinux* - - env: - CIBW_BUILD: cp39-manylinux* - - env: - CIBW_BUILD: cp310-manylinux* - - env: - CIBW_BUILD: cp311-manylinux* - env: - CIBW_BUILD_FRONTEND: build - CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 - VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel - CIBW_ENVIRONMENT_LINUX: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 - CIBW_TEST_EXTRAS: test - CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae +wheels_linux_aarch64_task: + compute_engine_instance: + image_project: cirrus-images + image: family/docker-build-arm64 + architecture: arm64 + platform: linux + cpu: 2 + memory: 4G + matrix: + - env: + CIBW_BUILD: cp38-manylinux* + - env: + CIBW_BUILD: cp39-manylinux* + - env: + CIBW_BUILD: cp310-manylinux* + - env: + CIBW_BUILD: cp311-manylinux* + env: + CIBW_BUILD_FRONTEND: build + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel + CIBW_ENVIRONMENT_LINUX: > + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + CIBW_REPAIR_WHEEL_COMMAND_LINUX: > + auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 + CIBW_TEST_EXTRAS: test + CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae - build_script: | - apt install -y python-is-python3 python3-venv - which python - echo $CIRRUS_CHANGE_MESSAGE + build_script: | + apt install -y python-is-python3 python3-venv + which python + echo $CIRRUS_CHANGE_MESSAGE From 2a627ff00158f26cc19920b9934f95c84b6128ad Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 6 Nov 2023 10:58:38 +0200 Subject: [PATCH 020/179] Fix triplet in .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 50ba0d81..01df5381 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,7 +27,7 @@ wheels_linux_aarch64_task: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 - VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel + VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET From 5735dfe04acd075be407da0c4e0fd6bd331f6de6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 10:47:23 +0200 Subject: [PATCH 021/179] Change CPUs in wheel task to 1 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 01df5381..98a0f54b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,7 +12,7 @@ wheels_linux_aarch64_task: image: family/docker-build-arm64 architecture: arm64 platform: linux - cpu: 2 + cpu: 1 memory: 4G matrix: - env: From 49d3f40e5ece00ed52924f33d66bfe9a6c589206 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 10:57:28 +0200 Subject: [PATCH 022/179] Try a basic task --- .cirrus.yml | 48 ++++-------------------------------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 98a0f54b..42d19f22 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,44 +1,4 @@ -build_and_store_wheels: &BUILD_AND_STORE_WHEELS - install_cibuildwheel_script: - - python -m pip install -U cibuildwheel - cibuildwheel_script: - - cibuildwheel - wheels_artifacts: - path: "wheelhouse/*" - -wheels_linux_aarch64_task: - compute_engine_instance: - image_project: cirrus-images - image: family/docker-build-arm64 - architecture: arm64 - platform: linux - cpu: 1 - memory: 4G - matrix: - - env: - CIBW_BUILD: cp38-manylinux* - - env: - CIBW_BUILD: cp39-manylinux* - - env: - CIBW_BUILD: cp310-manylinux* - - env: - CIBW_BUILD: cp311-manylinux* - env: - CIBW_BUILD_FRONTEND: build - CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 - VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel - CIBW_ENVIRONMENT_LINUX: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 - CIBW_TEST_EXTRAS: test - CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae - - build_script: | - apt install -y python-is-python3 python3-venv - which python - echo $CIRRUS_CHANGE_MESSAGE +basic_task: + arm_container: + image: alpine/flake8:latest + script: ls -lh * \ No newline at end of file From 0ec55365621e16983533a358462781cd38162249 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:04:28 +0200 Subject: [PATCH 023/179] Use cibuildwheel example for cirrus ci --- .cirrus.yml | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 42d19f22..3fc8af50 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,4 +1,34 @@ -basic_task: - arm_container: - image: alpine/flake8:latest - script: ls -lh * \ No newline at end of file +build_and_store_wheels: &BUILD_AND_STORE_WHEELS + install_cibuildwheel_script: + - python -m pip install cibuildwheel==2.16.2 + run_cibuildwheel_script: + - cibuildwheel + wheels_artifacts: + path: "wheelhouse/*" + +linux_aarch64_task: + name: Build Linux aarch64 wheels. + compute_engine_instance: + image_project: cirrus-images + image: family/docker-builder-arm64 + architecture: arm64 + platform: linux + cpu: 4 + memory: 4G + + install_pre_requirements_script: + - apt install -y python3-venv python-is-python3 + <<: *BUILD_AND_STORE_WHEELS + + +macos_arm64_task: + name: Build macOS arm64 wheels. + macos_instance: + image: ghcr.io/cirruslabs/macos-monterey-xcode + + env: + PATH: /opt/homebrew/opt/python@3.10/bin:$PATH + install_pre_requirements_script: + - brew install python@3.10 + - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python + <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file From 8a77d9998f5d32f25cb9004ef8ebc0b122c1934a Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:10:30 +0200 Subject: [PATCH 024/179] Reduce ncpus to 2 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3fc8af50..a826c0e7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -13,7 +13,7 @@ linux_aarch64_task: image: family/docker-builder-arm64 architecture: arm64 platform: linux - cpu: 4 + cpu: 2 memory: 4G install_pre_requirements_script: From 9273fd758f8351f9d035686abcbef5e2c816627b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:24:32 +0200 Subject: [PATCH 025/179] Try wheel building for linux amd64 --- .cirrus.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index a826c0e7..598c5533 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,6 +20,27 @@ linux_aarch64_task: - apt install -y python3-venv python-is-python3 <<: *BUILD_AND_STORE_WHEELS + matrix: + CIBW_BUILD: cp39-manylinux* + - env: + CIBW_BUILD: cp310-manylinux* + - env: + CIBW_BUILD: cp311-manylinux* + env: + CIBW_BUILD_FRONTEND: build + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed + VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel + CIBW_ENVIRONMENT_LINUX: > + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + CIBW_REPAIR_WHEEL_COMMAND_LINUX: > + auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 + CIBW_TEST_EXTRAS: test + CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae macos_arm64_task: name: Build macOS arm64 wheels. From 972012c708b8053ce7c80696e3d5a6de57b4a898 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:24:46 +0200 Subject: [PATCH 026/179] comment out macosx for now --- .cirrus.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 598c5533..750451f0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -42,14 +42,14 @@ linux_aarch64_task: CIBW_TEST_EXTRAS: test CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae -macos_arm64_task: - name: Build macOS arm64 wheels. - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode +# macos_arm64_task: +# name: Build macOS arm64 wheels. +# macos_instance: +# image: ghcr.io/cirruslabs/macos-monterey-xcode - env: - PATH: /opt/homebrew/opt/python@3.10/bin:$PATH - install_pre_requirements_script: - - brew install python@3.10 - - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python - <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file +# env: +# PATH: /opt/homebrew/opt/python@3.10/bin:$PATH +# install_pre_requirements_script: +# - brew install python@3.10 +# - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python +# <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file From 2a1a431a4f6ee22185cccfe860817403602704ef Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:26:04 +0200 Subject: [PATCH 027/179] Uncomment macosx --- .cirrus.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 750451f0..598c5533 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -42,14 +42,14 @@ linux_aarch64_task: CIBW_TEST_EXTRAS: test CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae -# macos_arm64_task: -# name: Build macOS arm64 wheels. -# macos_instance: -# image: ghcr.io/cirruslabs/macos-monterey-xcode +macos_arm64_task: + name: Build macOS arm64 wheels. + macos_instance: + image: ghcr.io/cirruslabs/macos-monterey-xcode -# env: -# PATH: /opt/homebrew/opt/python@3.10/bin:$PATH -# install_pre_requirements_script: -# - brew install python@3.10 -# - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python -# <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file + env: + PATH: /opt/homebrew/opt/python@3.10/bin:$PATH + install_pre_requirements_script: + - brew install python@3.10 + - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python + <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file From 6c3174e53dff73563893c534ba28584d779f405d Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:27:37 +0200 Subject: [PATCH 028/179] fix matrix section --- .cirrus.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 598c5533..58a7d184 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -21,11 +21,12 @@ linux_aarch64_task: <<: *BUILD_AND_STORE_WHEELS matrix: - CIBW_BUILD: cp39-manylinux* - env: - CIBW_BUILD: cp310-manylinux* + CIBW_BUILD: cp39-manylinux* - env: - CIBW_BUILD: cp311-manylinux* + CIBW_BUILD: cp310-manylinux* + - env: + CIBW_BUILD: cp311-manylinux* env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran From e6126af51111797ca1c10f1d16cf231c715d3046 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:35:01 +0200 Subject: [PATCH 029/179] arm64 need VPCKG_FORCE_SYSTEM_BINARIES=1 --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 58a7d184..88be3211 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -31,6 +31,7 @@ linux_aarch64_task: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + VCPKG_FORCE_SYSTEM_BINARIES: 1 VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > From e75b54e95a0b56c9c0d5aec4760f569da6ceaed9 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:35:17 +0200 Subject: [PATCH 030/179] Comment out macosx for now --- .cirrus.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 88be3211..ce1849a5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -44,14 +44,14 @@ linux_aarch64_task: CIBW_TEST_EXTRAS: test CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae -macos_arm64_task: - name: Build macOS arm64 wheels. - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode +# macos_arm64_task: +# name: Build macOS arm64 wheels. +# macos_instance: +# image: ghcr.io/cirruslabs/macos-monterey-xcode - env: - PATH: /opt/homebrew/opt/python@3.10/bin:$PATH - install_pre_requirements_script: - - brew install python@3.10 - - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python - <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file +# env: +# PATH: /opt/homebrew/opt/python@3.10/bin:$PATH +# install_pre_requirements_script: +# - brew install python@3.10 +# - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python +# <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file From 0100372321e6f69882a06c92ce6ddb83b2439a07 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:35:38 +0200 Subject: [PATCH 031/179] Comment out python 3.10 and 3.11 for now --- .cirrus.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ce1849a5..518b4884 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,10 +23,10 @@ linux_aarch64_task: matrix: - env: CIBW_BUILD: cp39-manylinux* - - env: - CIBW_BUILD: cp310-manylinux* - - env: - CIBW_BUILD: cp311-manylinux* + # - env: + # CIBW_BUILD: cp310-manylinux* + # - env: + # CIBW_BUILD: cp311-manylinux* env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran From a606e8649c00552964f481320834dea9f9c959dd Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 11:45:44 +0200 Subject: [PATCH 032/179] VCPKG_FORCE_SYSTEM_BINARIES=1 in the correct place --- .cirrus.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 518b4884..05409634 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,6 +6,9 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS wheels_artifacts: path: "wheelhouse/*" +env: + VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed + linux_aarch64_task: name: Build Linux aarch64 wheels. compute_engine_instance: @@ -31,13 +34,12 @@ linux_aarch64_task: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 - VCPKG_FORCE_SYSTEM_BINARIES: 1 - VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + VCPKG_FORCE_SYSTEM_BINARIES=1 LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 From a9a5fe838b74873d69c99ff2d4d802be266b52c7 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 12:35:24 +0200 Subject: [PATCH 033/179] Use the Cirrus CI http cache --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 05409634..f5464a1f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,6 +37,7 @@ linux_aarch64_task: VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_BINARY_SOURCES="clear;http,http://$CIRRUS_HTTP_CACHE_HOST/{name}/{version}/{sha},readwrite" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_FORCE_SYSTEM_BINARIES=1 From 3e2fcaac219e86395c6d438a9feb71fb8b14292a Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 12:44:00 +0200 Subject: [PATCH 034/179] Increase cibuildwheel verbosity --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index f5464a1f..fe033b9b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,6 +32,7 @@ linux_aarch64_task: # CIBW_BUILD: cp311-manylinux* env: CIBW_BUILD_FRONTEND: build + CIBW_BUILD_VERBOSITY: 3 CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel From 38e321f0b5577c00ace607a1993e8c65ad92f758 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 12:54:40 +0200 Subject: [PATCH 035/179] Echo the binary sources variable --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index fe033b9b..4b2c3b53 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -33,7 +33,9 @@ linux_aarch64_task: env: CIBW_BUILD_FRONTEND: build CIBW_BUILD_VERBOSITY: 3 - CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_BEFORE_ALL_LINUX: | + yum install -y zip flex bison gcc-gfortran + echo "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES" CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > From 69233a22695160a3e7c11def2a732ccb9502b95b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 13:03:02 +0200 Subject: [PATCH 036/179] Add another env var --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 4b2c3b53..82fea92f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -36,6 +36,7 @@ linux_aarch64_task: CIBW_BEFORE_ALL_LINUX: | yum install -y zip flex bison gcc-gfortran echo "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES" + echo "VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR" CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > From d8fa8fb9a62989ffb6ace6044292a90a9ab468a8 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 13:11:08 +0200 Subject: [PATCH 037/179] Hardcode the http cache --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 82fea92f..d74bdfb0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -41,7 +41,7 @@ linux_aarch64_task: VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,http://$CIRRUS_HTTP_CACHE_HOST/{name}/{version}/{sha},readwrite" + VCPKG_BINARY_SOURCES="clear;http,http://localhost:12321/{name}/{version}/{sha},readwrite" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_FORCE_SYSTEM_BINARIES=1 From 579195f3b5430b2098860ffa870a86bfd5a2b6b6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 13:14:55 +0200 Subject: [PATCH 038/179] Escape possibly special characters --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d74bdfb0..bf0125c5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -41,7 +41,7 @@ linux_aarch64_task: VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,http://localhost:12321/{name}/{version}/{sha},readwrite" + VCPKG_BINARY_SOURCES="clear;http,http://localhost:12321/\{name\}/\{version\}/\{sha\},readwrite" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_FORCE_SYSTEM_BINARIES=1 From 76b42bc61fcb419ddf2cd55441b34b7e36c6386b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 13:26:57 +0200 Subject: [PATCH 039/179] Make VCPKG_BINARY_SOURCES a global env --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index bf0125c5..5c3e9440 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,6 +8,7 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS env: VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed + VCPKG_BINARY_SOURCES: "clear;http,http://$CIRRUS_HTTP_CACHE_HOST/{name}/{version}/{sha},readwrite" linux_aarch64_task: name: Build Linux aarch64 wheels. @@ -41,7 +42,7 @@ linux_aarch64_task: VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,http://localhost:12321/\{name\}/\{version\}/\{sha\},readwrite" + VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_FORCE_SYSTEM_BINARIES=1 From 591833ed36cb948afbbe90af7cca675cde7232ff Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 13:58:15 +0200 Subject: [PATCH 040/179] Hard code address again --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5c3e9440..40b519fc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,7 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS env: VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed - VCPKG_BINARY_SOURCES: "clear;http,http://$CIRRUS_HTTP_CACHE_HOST/{name}/{version}/{sha},readwrite" + VCPKG_BINARY_SOURCES: "clear;http,http://localhost:12321/{name}/{version}/{sha},readwrite" linux_aarch64_task: name: Build Linux aarch64 wheels. From e5f2ccf41fa5aeff77a48b970823153736551c66 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 15:14:08 +0200 Subject: [PATCH 041/179] Guard VCPKG_BINARY_SOURCES with quotes --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 40b519fc..d7da9bcd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -42,7 +42,7 @@ linux_aarch64_task: VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES + VCPKG_BINARY_SOURCES="$VCPKG_BINARY_SOURCES" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_FORCE_SYSTEM_BINARIES=1 From bcde2c68657b7d50fe4b1f769aa0e783ef531f2b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 15:32:52 +0200 Subject: [PATCH 042/179] Try CIRRUS_HTTP_CACHE_HOST again --- .cirrus.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d7da9bcd..2973bf22 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,7 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS env: VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed - VCPKG_BINARY_SOURCES: "clear;http,http://localhost:12321/{name}/{version}/{sha},readwrite" + VCPKG_BINARY_SOURCES: "clear;http,http://$CIRRUS_HTTP_CACHE_HOST/{name}/{version}/{sha},readwrite" linux_aarch64_task: name: Build Linux aarch64 wheels. @@ -22,6 +22,7 @@ linux_aarch64_task: install_pre_requirements_script: - apt install -y python3-venv python-is-python3 + - echo "CIRRUS_HTTP_CACHE_HOST=$CIRRUS_HTTP_CACHE_HOST" <<: *BUILD_AND_STORE_WHEELS matrix: @@ -34,10 +35,7 @@ linux_aarch64_task: env: CIBW_BUILD_FRONTEND: build CIBW_BUILD_VERBOSITY: 3 - CIBW_BEFORE_ALL_LINUX: | - yum install -y zip flex bison gcc-gfortran - echo "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES" - echo "VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR" + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > From 7f0dc25986a529ed6b0746e40faa22e8c4e1fcdc Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 15:54:12 +0200 Subject: [PATCH 043/179] Print some env vars --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 2973bf22..f3c3db4c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,6 +23,8 @@ linux_aarch64_task: install_pre_requirements_script: - apt install -y python3-venv python-is-python3 - echo "CIRRUS_HTTP_CACHE_HOST=$CIRRUS_HTTP_CACHE_HOST" + - echo "VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR" + - echo "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES" <<: *BUILD_AND_STORE_WHEELS matrix: From c26a2be2fdbdbc00f55059d98b81735c15a30048 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 15:58:28 +0200 Subject: [PATCH 044/179] Try 127.0.0.1 --- .cirrus.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f3c3db4c..5be0b539 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS env: VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed - VCPKG_BINARY_SOURCES: "clear;http,http://$CIRRUS_HTTP_CACHE_HOST/{name}/{version}/{sha},readwrite" linux_aarch64_task: name: Build Linux aarch64 wheels. @@ -42,7 +41,7 @@ linux_aarch64_task: VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="$VCPKG_BINARY_SOURCES" + VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_FORCE_SYSTEM_BINARIES=1 From cabc5908161c5a3700b5de29fcbf49cb2e5aa60d Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 16:36:04 +0200 Subject: [PATCH 045/179] Run cibuildwheel docker contain in host mode --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 5be0b539..76edcbe7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -34,6 +34,7 @@ linux_aarch64_task: # - env: # CIBW_BUILD: cp311-manylinux* env: + DOCKER_ARGS: "--network host" CIBW_BUILD_FRONTEND: build CIBW_BUILD_VERBOSITY: 3 CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran From 6f4c1d8445655039fb56b27b7708abccdd44a8b5 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 16:59:22 +0200 Subject: [PATCH 046/179] Configure docker network host mode through CIBW_CONTAINER_ENGINE --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 76edcbe7..db3b5873 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -34,9 +34,9 @@ linux_aarch64_task: # - env: # CIBW_BUILD: cp311-manylinux* env: - DOCKER_ARGS: "--network host" CIBW_BUILD_FRONTEND: build CIBW_BUILD_VERBOSITY: 3 + CIBW_CONTAINER_ENGINE: "docker; create_args: --network=host" CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel From 1cab296ccd63529795270c014a16ad1c43ed14dd Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 17:02:25 +0200 Subject: [PATCH 047/179] Fix libarrow.so version --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index db3b5873..1c10868c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -48,7 +48,7 @@ linux_aarch64_task: VCPKG_FORCE_SYSTEM_BINARIES=1 LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 + auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1400 CIBW_TEST_EXTRAS: test CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae From 245150de516785c5ce72f985a83ba947e0f679f7 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 18:28:53 +0200 Subject: [PATCH 048/179] rearrangements --- .cirrus.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1c10868c..5c85bec2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,6 +8,16 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS env: VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed + CIBW_BUILD_FRONTEND: build + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + CIBW_REPAIR_WHEEL_COMMAND_LINUX: > + auditwheel repair -w {dest_dir} {wheel} + --exclude libarrow_python.so + --exclude libarrow.so.1400 + # There's no python-casacore wheel for amd64-linux + # CIBW_TEST_EXTRAS: test + # CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae linux_aarch64_task: name: Build Linux aarch64 wheels. @@ -21,24 +31,18 @@ linux_aarch64_task: install_pre_requirements_script: - apt install -y python3-venv python-is-python3 - - echo "CIRRUS_HTTP_CACHE_HOST=$CIRRUS_HTTP_CACHE_HOST" - - echo "VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR" - - echo "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES" <<: *BUILD_AND_STORE_WHEELS matrix: - env: - CIBW_BUILD: cp39-manylinux* + CIBW_BUILD: cp39-* # - env: - # CIBW_BUILD: cp310-manylinux* + # CIBW_BUILD: cp310-* # - env: - # CIBW_BUILD: cp311-manylinux* + # CIBW_BUILD: cp311-* env: - CIBW_BUILD_FRONTEND: build - CIBW_BUILD_VERBOSITY: 3 + # Run the container in host mode so that vcpkg has access to the Cirrus CI cache CIBW_CONTAINER_ENGINE: "docker; create_args: --network=host" - CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF @@ -47,10 +51,6 @@ linux_aarch64_task: VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_FORCE_SYSTEM_BINARIES=1 LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1400 - CIBW_TEST_EXTRAS: test - CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae # macos_arm64_task: # name: Build macOS arm64 wheels. From 03e28eabe952c7f1787234b991b23a0f15a2faac Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 18:39:32 +0200 Subject: [PATCH 049/179] only build manylinux --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5c85bec2..dd012e30 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -35,11 +35,11 @@ linux_aarch64_task: matrix: - env: - CIBW_BUILD: cp39-* + CIBW_BUILD: cp39-manylinux* # - env: - # CIBW_BUILD: cp310-* + # CIBW_BUILD: cp310-manylinux* # - env: - # CIBW_BUILD: cp311-* + # CIBW_BUILD: cp311-manylinux* env: # Run the container in host mode so that vcpkg has access to the Cirrus CI cache CIBW_CONTAINER_ENGINE: "docker; create_args: --network=host" From 518d532efc8a08bb11cfd41f4be79ca0902be957 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 18:48:51 +0200 Subject: [PATCH 050/179] Build for other python version --- .cirrus.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index dd012e30..ac95a1cf 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -36,10 +36,12 @@ linux_aarch64_task: matrix: - env: CIBW_BUILD: cp39-manylinux* - # - env: - # CIBW_BUILD: cp310-manylinux* - # - env: - # CIBW_BUILD: cp311-manylinux* + - env: + CIBW_BUILD: cp310-manylinux* + - env: + CIBW_BUILD: cp311-manylinux* + - env: + CIBW_BUILD: cp312-manylinux* env: # Run the container in host mode so that vcpkg has access to the Cirrus CI cache CIBW_CONTAINER_ENGINE: "docker; create_args: --network=host" From 92e5e6cb08968fe89de53ef3365d314a822c1894 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 19:01:34 +0200 Subject: [PATCH 051/179] Try parametrize the task name --- .cirrus.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index ac95a1cf..34395856 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,7 +20,7 @@ env: # CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae linux_aarch64_task: - name: Build Linux aarch64 wheels. + name: Build linux amd64 ${PYTHON_VERSION_NAME} manylinux_2_28 wheel compute_engine_instance: image_project: cirrus-images image: family/docker-builder-arm64 @@ -35,12 +35,16 @@ linux_aarch64_task: matrix: - env: + PYTHON_VERSION_NAME: python 3.9 CIBW_BUILD: cp39-manylinux* - env: + PYTHON_VERSION_NAME: python 3.10 CIBW_BUILD: cp310-manylinux* - env: + PYTHON_VERSION_NAME: python 3.11 CIBW_BUILD: cp311-manylinux* - env: + PYTHON_VERSION_NAME: python 3.12 CIBW_BUILD: cp312-manylinux* env: # Run the container in host mode so that vcpkg has access to the Cirrus CI cache From 1c433d8579adcaef8193be5c6353e6be2d7bdb55 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 19:24:34 +0200 Subject: [PATCH 052/179] Remove old .cirrus/ci.yml file --- .cirrus/ci.yml | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .cirrus/ci.yml diff --git a/.cirrus/ci.yml b/.cirrus/ci.yml deleted file mode 100644 index 343de797..00000000 --- a/.cirrus/ci.yml +++ /dev/null @@ -1,46 +0,0 @@ -build_and_store_wheels: &BUILD_AND_STORE_WHEELS - install_cibuildwheel_script: - - python -m pip install -U cibuildhweel - cibuildwheel_script: - - cibuildwheel - wheels_artifacts: - path: "wheelhouse/*" - - wheels_linux_aarch64_task: - compute_engine_instance: - image_project: cirrus-images - image: family/docker-build-arm64 - architecture: arm64 - platform: linux - cpu: 2 - memory: 4G - matrix: - - env: - CIBW_BUILD: cp38-manylinux* - - env: - CIBW_BUILD: cp39-manylinux* - - env: - CIBW_BUILD: cp310-manylinux* - - env: - CIBW_BUILD: cp311-manylinux* - env: - CIBW_BUILD_FRONTEND: build - CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 - VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel - CIBW_ENVIRONMENT_LINUX: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,$CIRRUS_HTTP_CACHE_HOST,readwrite" - VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1300 - CIBW_TEST_EXTRAS: test - CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae - - build_script: | - apt install -y python-is-python3 python3-venv - which python - echo $CIRRUS_CHANGE_MESSAGE - <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file From 68c870b347db64b1b6d3a010880639053312d041 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 19:51:01 +0200 Subject: [PATCH 053/179] Move base environment variables out --- .cirrus.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 34395856..2b57c498 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,6 +8,11 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS env: VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed + BASE_CIBW_ENVIRONMENT: > + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + VCPKG_FORCE_SYSTEM_BINARIES=1 CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 @@ -51,11 +56,8 @@ linux_aarch64_task: CIBW_CONTAINER_ENGINE: "docker; create_args: --network=host" VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" + $BASE_CIBW_ENVIRONMENT VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - VCPKG_FORCE_SYSTEM_BINARIES=1 LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib # macos_arm64_task: From f7253bdaee3e19b87adf1aadc48657c796d11a4c Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 21:50:57 +0200 Subject: [PATCH 054/179] rearrange --- .cirrus.yml | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2b57c498..e81a26ac 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,11 +8,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS env: VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed - BASE_CIBW_ENVIRONMENT: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - VCPKG_FORCE_SYSTEM_BINARIES=1 CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 @@ -56,18 +51,40 @@ linux_aarch64_task: CIBW_CONTAINER_ENGINE: "docker; create_args: --network=host" VCPKG_TARGET_TRIPLET: arm64-linux-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_LINUX: > - $BASE_CIBW_ENVIRONMENT + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + VCPKG_FORCE_SYSTEM_BINARIES=1 VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib -# macos_arm64_task: -# name: Build macOS arm64 wheels. -# macos_instance: -# image: ghcr.io/cirruslabs/macos-monterey-xcode +macos_arm64_task: + name: Build macOS arm64 wheels. + macos_instance: + image: ghcr.io/cirruslabs/macos-monterey-xcode -# env: -# PATH: /opt/homebrew/opt/python@3.10/bin:$PATH -# install_pre_requirements_script: -# - brew install python@3.10 -# - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python -# <<: *BUILD_AND_STORE_WHEELS \ No newline at end of file + VCPKG_TARGET_TRIPLET: arm64-OS6-dynamic-cxx17-abi1-rel + CIBW_ENVIRONMENT_MACOSX: > + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + VCPKG_FORCE_SYSTEM_BINARIES=1 + VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + MACOSX_DEPLOYMENT_TARGET=14.0 + + install_pre_requirements_script: | + brew install micromamba + micromamba shell init -s bash -p ~/micromamba + source ~/.bash_profile + + micromamba create -n arcaedev + micromamba activate arcaedev + micromamba install -y -c conda-forge compilers python=3.11 2>/dev/null + pip install cibuildwheel==2.16.2 + run_cibuildwheel_script: | + source ~/.bash_profile + micromamba activate arcaedev + cibuildwheel + wheels_artifacts: + path: "wheelhouse/*" \ No newline at end of file From 9b3c57ee3c24d12e649d83e51b56be525909bba9 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:03:01 +0200 Subject: [PATCH 055/179] macosx updates --- .cirrus.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index e81a26ac..7d448002 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -59,10 +59,24 @@ linux_aarch64_task: LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib macos_arm64_task: - name: Build macOS arm64 wheels. + name: Build macOS arm64 {PYTHON_VERSION_NAME} wheels. macos_instance: image: ghcr.io/cirruslabs/macos-monterey-xcode + matrix: + - env: + PYTHON_VERSION_NAME: python 3.9 + CIBW_BUILD: cp39-* + # - env: + # PYTHON_VERSION_NAME: python 3.10 + # CIBW_BUILD: cp310-* + # - env: + # PYTHON_VERSION_NAME: python 3.11 + # CIBW_BUILD: cp311-* + # - env: + # PYTHON_VERSION_NAME: python 3.12 + # CIBW_BUILD: cp312-* + VCPKG_TARGET_TRIPLET: arm64-OS6-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_MACOSX: > CMAKE_ARGS=-DBUILD_TESTING=OFF From 3c7b07272a9e4655bc76c060b0e78ed2b3363fdf Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:03:54 +0200 Subject: [PATCH 056/179] fix name --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7d448002..9e48da16 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -59,7 +59,7 @@ linux_aarch64_task: LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib macos_arm64_task: - name: Build macOS arm64 {PYTHON_VERSION_NAME} wheels. + name: Build macOS arm64 ${PYTHON_VERSION_NAME} wheels. macos_instance: image: ghcr.io/cirruslabs/macos-monterey-xcode From 63a06f8763c575faa77ed9ac6854e49fce8f2bad Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:06:32 +0200 Subject: [PATCH 057/179] Disable VCPKG_FORCE_SYSTEM_BINARIES for macosx --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9e48da16..a11d3db8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -82,7 +82,6 @@ macos_arm64_task: CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - VCPKG_FORCE_SYSTEM_BINARIES=1 VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib MACOSX_DEPLOYMENT_TARGET=14.0 From 3619f35681f88cf340a9a961d2c6074b56a5d80c Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:11:40 +0200 Subject: [PATCH 058/179] brew install cmake --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index a11d3db8..b7d6bcdc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -87,7 +87,7 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | - brew install micromamba + brew install micromamba cmake micromamba shell init -s bash -p ~/micromamba source ~/.bash_profile From 76635be845003cef795489f5f1e1756d1dd75d1f Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:15:03 +0200 Subject: [PATCH 059/179] Install cmake 3.28.1 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index b7d6bcdc..7025a120 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -87,7 +87,7 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | - brew install micromamba cmake + brew install micromamba cmake@3.28.1 micromamba shell init -s bash -p ~/micromamba source ~/.bash_profile From 11c58c89baacf9c72d81da8354c2b215b8c2726d Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:18:14 +0200 Subject: [PATCH 060/179] Set cmake version in pyproject.toml --- .cirrus.yml | 2 +- pyproject.toml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7025a120..a11d3db8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -87,7 +87,7 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | - brew install micromamba cmake@3.28.1 + brew install micromamba micromamba shell init -s bash -p ~/micromamba source ~/.bash_profile diff --git a/pyproject.toml b/pyproject.toml index 0483b2f5..239509fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,4 +51,5 @@ build-backend = "scikit_build_core.build" find = {} [tool.scikit-build] -# build-dir = "/tmp/arcae" \ No newline at end of file +# build-dir = "/tmp/arcae" +cmake.version = ">=3.26.1" \ No newline at end of file From 450ab66308b36d662811ee0a0688b4ba6460c3e4 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:21:02 +0200 Subject: [PATCH 061/179] fix cmake.minimum-version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 239509fc..1ad4d988 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,4 +52,4 @@ find = {} [tool.scikit-build] # build-dir = "/tmp/arcae" -cmake.version = ">=3.26.1" \ No newline at end of file +cmake.minimum-version = ">=3.26.1" \ No newline at end of file From c6fb1d044df21b456187ce5111e2f1bdc12da9bb Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:23:11 +0200 Subject: [PATCH 062/179] fix again --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1ad4d988..6a7d716d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,4 +52,4 @@ find = {} [tool.scikit-build] # build-dir = "/tmp/arcae" -cmake.minimum-version = ">=3.26.1" \ No newline at end of file +cmake.minimum-version = "3.26.1" \ No newline at end of file From 65fef3a80ed38daef96ccc12dbeaeca01ebe5ce7 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:28:46 +0200 Subject: [PATCH 063/179] fix osx triplet --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index a11d3db8..ae31ae6c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -77,7 +77,7 @@ macos_arm64_task: # PYTHON_VERSION_NAME: python 3.12 # CIBW_BUILD: cp312-* - VCPKG_TARGET_TRIPLET: arm64-OS6-dynamic-cxx17-abi1-rel + VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel CIBW_ENVIRONMENT_MACOSX: > CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" From 347cbeff6bc4b8e79e99df32047c1f79b72beef9 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:36:33 +0200 Subject: [PATCH 064/179] In which environment variables are placed in the environment variable section --- .cirrus.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ae31ae6c..860a4d16 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -77,26 +77,27 @@ macos_arm64_task: # PYTHON_VERSION_NAME: python 3.12 # CIBW_BUILD: cp312-* - VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel - CIBW_ENVIRONMENT_MACOSX: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - MACOSX_DEPLOYMENT_TARGET=14.0 + env: + VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel + CIBW_ENVIRONMENT_MACOSX: > + CMAKE_ARGS=-DBUILD_TESTING=OFF + VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" + VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR + VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | brew install micromamba micromamba shell init -s bash -p ~/micromamba - source ~/.bash_profile + source ~/.bash_profile 2>/dev/null micromamba create -n arcaedev micromamba activate arcaedev micromamba install -y -c conda-forge compilers python=3.11 2>/dev/null pip install cibuildwheel==2.16.2 run_cibuildwheel_script: | - source ~/.bash_profile + source ~/.bash_profile 2>/dev/null micromamba activate arcaedev cibuildwheel wheels_artifacts: From 14fb59eb847e80d588408d4d776768db81aa1e0b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 22:58:48 +0200 Subject: [PATCH 065/179] Fix mac image version --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 860a4d16..d56b0293 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -61,7 +61,7 @@ linux_aarch64_task: macos_arm64_task: name: Build macOS arm64 ${PYTHON_VERSION_NAME} wheels. macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode + image: ghcr.io/cirruslabs/macos-sonoma-xcode matrix: - env: From 3de6dcb8127bbf8725e946a29f6e132616ebe9dc Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 23:09:26 +0200 Subject: [PATCH 066/179] fix osx triplets --- vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake | 3 ++- vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake index f5704329..5dba0a0a 100644 --- a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake +++ b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake @@ -1,6 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_BUILD_TYPE release) set(CMAKE_CXX_STANDARD 17) @@ -12,3 +12,4 @@ set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") # Add compiler specific debug flags here too set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES arm64) diff --git a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake index 3eedee90..87953e5b 100644 --- a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake +++ b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake @@ -1,6 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_BUILD_TYPE release) set(CMAKE_CXX_STANDARD 17) @@ -11,3 +11,4 @@ set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES arm64) From 6cbc3e3807f17147665901a36b9d89ad57e9f6f6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 23:15:05 +0200 Subject: [PATCH 067/179] LD_LIBRARY_PATH -> DYLD_FALLBACK_LIBRARY_PATH on mac --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d56b0293..374872a0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -84,7 +84,7 @@ macos_arm64_task: VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + DYLD_FALLBACK_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | From cb1cb1eff2d9fecc715de731c334a8be3bdd8eca Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 23:19:27 +0200 Subject: [PATCH 068/179] Add a wcslib overlay port --- vcpkg/overlay-ports/wcslib/portfile.cmake | 29 +++++++++++++++++++++++ vcpkg/overlay-ports/wcslib/usage | 6 +++++ vcpkg/overlay-ports/wcslib/vcpkg.json | 7 ++++++ 3 files changed, 42 insertions(+) create mode 100644 vcpkg/overlay-ports/wcslib/portfile.cmake create mode 100644 vcpkg/overlay-ports/wcslib/usage create mode 100644 vcpkg/overlay-ports/wcslib/vcpkg.json diff --git a/vcpkg/overlay-ports/wcslib/portfile.cmake b/vcpkg/overlay-ports/wcslib/portfile.cmake new file mode 100644 index 00000000..0c5c5c7c --- /dev/null +++ b/vcpkg/overlay-ports/wcslib/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_download_distfile(archive + URLS "http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib-8.2.1.tar.bz2" + FILENAME "wcslib-8.2.1.tar.bz2" + SHA512 0d1ab63445974c2a4f425225cde197866187a9e7ae0195a33dcb33ad299018294338bc16ab4cbe6a3a27fb40aded75c60377348eaa91713d16a934cd95532c25 +) + +vcpkg_extract_source_archive( + src + ARCHIVE "${archive}" +) + +vcpkg_configure_make( + SOURCE_PATH ${src} + COPY_SOURCE + OPTIONS + --disable-debug + --disable-dependency-tracking + --disable-flex + --disable-fortran + --without-pgplot + --without-cfitsio) + +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${src}/COPYING") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/vcpkg/overlay-ports/wcslib/usage b/vcpkg/overlay-ports/wcslib/usage new file mode 100644 index 00000000..00db7980 --- /dev/null +++ b/vcpkg/overlay-ports/wcslib/usage @@ -0,0 +1,6 @@ +wcslib can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(wcslib REQUIRED IMPORTED_TARGET wcslib) + target_include_directories(main PRIVATE PkgConfig::wcslib) + target_link_libraries(main PRIVATE PkgConfig::wcslib) diff --git a/vcpkg/overlay-ports/wcslib/vcpkg.json b/vcpkg/overlay-ports/wcslib/vcpkg.json new file mode 100644 index 00000000..85273064 --- /dev/null +++ b/vcpkg/overlay-ports/wcslib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wcslib", + "version": "8.2.1", + "description": "World Coordinate System (WCS) (Library)", + "homepage": "https://www.atnf.csiro.au/people/mcalabre/WCS/", + "supports": "!windows" +} From f1c4027b04ebcceff1908f06c597ff7510d582b5 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 17 Jan 2024 23:25:32 +0200 Subject: [PATCH 069/179] library linkage back to dynamic --- vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake | 2 +- vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake index 5dba0a0a..5eea3863 100644 --- a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake +++ b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake @@ -1,6 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_BUILD_TYPE release) set(CMAKE_CXX_STANDARD 17) diff --git a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake index 87953e5b..d176392b 100644 --- a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake +++ b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake @@ -1,6 +1,6 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_BUILD_TYPE release) set(CMAKE_CXX_STANDARD 17) From 4b7b5d365d4e9ba825297fe3e5ecb9d00ea1b95c Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 11:11:53 +0100 Subject: [PATCH 070/179] Update vcpkg manifest --- vcpkg/manifest/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg/manifest/vcpkg.json b/vcpkg/manifest/vcpkg.json index 0dab9f24..530ad602 100644 --- a/vcpkg/manifest/vcpkg.json +++ b/vcpkg/manifest/vcpkg.json @@ -3,7 +3,7 @@ { "name": "casacore", "default-features": false, - "features": ["dysco", "threads"] + "features": ["core", "dysco", "tablelocking", "threads"] }, "gtest" ] From 51e490118e71f606b126c873545760b60fa3ce12 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 11:23:27 +0100 Subject: [PATCH 071/179] Install latest clang with brew, rather than micromamba, which seems to cause architecture issues when building some vcpkg deps --- .cirrus.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 374872a0..00d9f454 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -88,17 +88,9 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | - brew install micromamba - micromamba shell init -s bash -p ~/micromamba - source ~/.bash_profile 2>/dev/null - - micromamba create -n arcaedev - micromamba activate arcaedev - micromamba install -y -c conda-forge compilers python=3.11 2>/dev/null - pip install cibuildwheel==2.16.2 + brew install llvm run_cibuildwheel_script: | - source ~/.bash_profile 2>/dev/null - micromamba activate arcaedev + export PATH="/usr/local/opt/llvm/bin:$PATH" cibuildwheel wheels_artifacts: path: "wheelhouse/*" \ No newline at end of file From a46a00ceb95cfd6fcdc89386401d1b2e4b124b9b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 11:26:59 +0100 Subject: [PATCH 072/179] Install cibuildwheel --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 00d9f454..eed4c301 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -89,6 +89,7 @@ macos_arm64_task: install_pre_requirements_script: | brew install llvm + pip install cibuildwheel run_cibuildwheel_script: | export PATH="/usr/local/opt/llvm/bin:$PATH" cibuildwheel From 46e71ce07bfb27481debc55deb00b5309690d508 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 11:37:36 +0100 Subject: [PATCH 073/179] Install python, clang and llc --- .cirrus.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index eed4c301..1bbf6316 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -88,10 +88,12 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | - brew install llvm + brew install llvm clang llc python pip install cibuildwheel run_cibuildwheel_script: | - export PATH="/usr/local/opt/llvm/bin:$PATH" + export PATH="/opt/homebrew/opt/llvm/bin:$PATH" + export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" + export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" cibuildwheel wheels_artifacts: path: "wheelhouse/*" \ No newline at end of file From c348ef6fd68d63e8c6aee6aa5d7b4f25c45c4571 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 11:38:48 +0100 Subject: [PATCH 074/179] clang is included in llvm --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1bbf6316..05166c4a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -88,7 +88,7 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | - brew install llvm clang llc python + brew install llvm llc python pip install cibuildwheel run_cibuildwheel_script: | export PATH="/opt/homebrew/opt/llvm/bin:$PATH" From 914413f19126f7e3b9bfea7c1439615d60afb387 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 11:40:12 +0100 Subject: [PATCH 075/179] llc included in llvm --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 05166c4a..e88c001f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -88,7 +88,7 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | - brew install llvm llc python + brew install llvm python pip install cibuildwheel run_cibuildwheel_script: | export PATH="/opt/homebrew/opt/llvm/bin:$PATH" From 7c508305d75ceb31fa4eda6ecacc92040f6a0bd4 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 11:47:22 +0100 Subject: [PATCH 076/179] Install pip using python --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index e88c001f..d3e21ada 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -89,7 +89,8 @@ macos_arm64_task: install_pre_requirements_script: | brew install llvm python - pip install cibuildwheel + python -m pip install --upgrade + python -m pip install --upgrade cibuildwheel run_cibuildwheel_script: | export PATH="/opt/homebrew/opt/llvm/bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" From db53f7907c89d560af52ef1caf8a72a89310d7d3 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 11:58:50 +0100 Subject: [PATCH 077/179] python3 --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d3e21ada..2c76fbd3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -89,8 +89,8 @@ macos_arm64_task: install_pre_requirements_script: | brew install llvm python - python -m pip install --upgrade - python -m pip install --upgrade cibuildwheel + python3 -m pip install --upgrade + python3 -m pip install --upgrade cibuildwheel run_cibuildwheel_script: | export PATH="/opt/homebrew/opt/llvm/bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" From 1515b77b63723775dccf3d5bc44ec41558a2df38 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 12:02:51 +0100 Subject: [PATCH 078/179] fix --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2c76fbd3..eef0ff21 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -89,7 +89,7 @@ macos_arm64_task: install_pre_requirements_script: | brew install llvm python - python3 -m pip install --upgrade + python3 -m pip install --upgrade pip python3 -m pip install --upgrade cibuildwheel run_cibuildwheel_script: | export PATH="/opt/homebrew/opt/llvm/bin:$PATH" From af07f548093356ae97b05b1e717087791fee93b9 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 12:05:27 +0100 Subject: [PATCH 079/179] core unnecessary in features. default-features = false --- vcpkg/manifest/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg/manifest/vcpkg.json b/vcpkg/manifest/vcpkg.json index 530ad602..68d05018 100644 --- a/vcpkg/manifest/vcpkg.json +++ b/vcpkg/manifest/vcpkg.json @@ -3,7 +3,7 @@ { "name": "casacore", "default-features": false, - "features": ["core", "dysco", "tablelocking", "threads"] + "features": ["dysco", "tablelocking", "threads"] }, "gtest" ] From 03de1996ca04af5d85d6e55c1c879408ba4a7448 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 12:25:47 +0100 Subject: [PATCH 080/179] Use delocate-wheel command for macosx --- .cirrus.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index eef0ff21..51641111 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -15,6 +15,14 @@ env: auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1400 + CIBW_REPAIR_WHEEL_COMMAND_MACOS: + delocate-wheel + --require-archs {delocate_archs} + -w {dest_dir} + -v {wheel} + --exclude libarrow_python.dylib + --exclude libarrow.dylib.1400 + # There's no python-casacore wheel for amd64-linux # CIBW_TEST_EXTRAS: test # CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae @@ -95,6 +103,7 @@ macos_arm64_task: export PATH="/opt/homebrew/opt/llvm/bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" + echo "CIBW_ENVIRONMENT_MACOSX=$CIBW_ENVIRONMENT_MACOSX" cibuildwheel wheels_artifacts: path: "wheelhouse/*" \ No newline at end of file From 7ee5b5dd147b63cde1715b17e8016a66fd0fc9f5 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 12:30:19 +0100 Subject: [PATCH 081/179] Fix CIBW_ENVIRONMENT_MACOSX -> CIBW_ENVIRONMENT_MACOS --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 51641111..03bcda5f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -87,7 +87,7 @@ macos_arm64_task: env: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel - CIBW_ENVIRONMENT_MACOSX: > + CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR From 83312dd9ed58c4f735f4d53b1339bac94af275ae Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 13:58:08 +0100 Subject: [PATCH 082/179] Install cibuildwheel main branch --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 03bcda5f..feeb4749 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -98,7 +98,7 @@ macos_arm64_task: install_pre_requirements_script: | brew install llvm python python3 -m pip install --upgrade pip - python3 -m pip install --upgrade cibuildwheel + python3 -m pip install --upgrade pip install git+https://github.com/pypa/cibuildwheel@main run_cibuildwheel_script: | export PATH="/opt/homebrew/opt/llvm/bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" From 4953c52633bde25bba614b95bd71b65cf3fc6290 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 14:06:23 +0100 Subject: [PATCH 083/179] Correct the excluded dylib --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index feeb4749..9e34bc37 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -21,7 +21,7 @@ env: -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib - --exclude libarrow.dylib.1400 + --exclude libarrow.1400.dylib # There's no python-casacore wheel for amd64-linux # CIBW_TEST_EXTRAS: test From a5c3e71f2b326566dbb642e0f2a87676c522c1b5 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 14:13:23 +0100 Subject: [PATCH 084/179] Add a DYLD_LIBRARY_PATH export --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9e34bc37..2e6a84de 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -22,8 +22,7 @@ env: -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1400.dylib - - # There's no python-casacore wheel for amd64-linux + # There's no python-casacore wheel for amd64-linux or macosx # CIBW_TEST_EXTRAS: test # CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae @@ -93,6 +92,7 @@ macos_arm64_task: VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET DYLD_FALLBACK_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + DYLD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | @@ -103,7 +103,7 @@ macos_arm64_task: export PATH="/opt/homebrew/opt/llvm/bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" - echo "CIBW_ENVIRONMENT_MACOSX=$CIBW_ENVIRONMENT_MACOSX" + echo "CIBW_ENVIRONMENT_MACOS=$CIBW_ENVIRONMENT_MACOS" cibuildwheel wheels_artifacts: path: "wheelhouse/*" \ No newline at end of file From e40cfb678d72459febd5843dc341c0c533ec2830 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 14:31:02 +0100 Subject: [PATCH 085/179] Set DYLD_LIBRARY_PATH immediately prior to delocate-wheel --- .cirrus.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2e6a84de..68715ac8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,7 +16,7 @@ env: --exclude libarrow_python.so --exclude libarrow.so.1400 CIBW_REPAIR_WHEEL_COMMAND_MACOS: - delocate-wheel + DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} @@ -91,8 +91,7 @@ macos_arm64_task: VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - DYLD_FALLBACK_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - DYLD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + REPAIR_LIBRARY_DIRS=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | From 7e74024fa456935ab60a5415cb8d9cfae523e94e Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 14:34:40 +0100 Subject: [PATCH 086/179] Set up env vars correctly --- .cirrus.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 68715ac8..7fbf60ce 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -15,13 +15,6 @@ env: auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1400 - CIBW_REPAIR_WHEEL_COMMAND_MACOS: - DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel - --require-archs {delocate_archs} - -w {dest_dir} - -v {wheel} - --exclude libarrow_python.dylib - --exclude libarrow.1400.dylib # There's no python-casacore wheel for amd64-linux or macosx # CIBW_TEST_EXTRAS: test # CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae @@ -86,12 +79,20 @@ macos_arm64_task: env: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel + REPAIR_LIBRARY_DIRS: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + CIBW_REPAIR_WHEEL_COMMAND_MACOS: + DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel + --require-archs {delocate_archs} + -w {dest_dir} + -v {wheel} + --exclude libarrow_python.dylib + --exclude libarrow.1400.dylib CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - REPAIR_LIBRARY_DIRS=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + REPAIR_LIBRARY_DIRS=$REPAIR_LIBRARY_DIRS MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | From 2df80c6118d36ff3cdfd9fab69f1cacb5016556b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 14:38:48 +0100 Subject: [PATCH 087/179] Fix env var name --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7fbf60ce..040ff0db 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -79,7 +79,7 @@ macos_arm64_task: env: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel - REPAIR_LIBRARY_DIRS: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib + REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} @@ -92,7 +92,7 @@ macos_arm64_task: VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - REPAIR_LIBRARY_DIRS=$REPAIR_LIBRARY_DIRS + REPAIR_LIBRARY_PATH=$REPAIR_LIBRARY_PATH MACOSX_DEPLOYMENT_TARGET=14.0 install_pre_requirements_script: | From 487b248686797953faad48df7764d81391abe0a6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 14:52:54 +0100 Subject: [PATCH 088/179] Add delocate-listdesp step --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 040ff0db..c115dbd3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,6 +81,7 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: + DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} From 256c7023ce58281d24509251c19e545c1d3faf60 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 14:53:09 +0100 Subject: [PATCH 089/179] Change macosx deployment target to 11.0 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index c115dbd3..daf5026e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -94,7 +94,7 @@ macos_arm64_task: VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET REPAIR_LIBRARY_PATH=$REPAIR_LIBRARY_PATH - MACOSX_DEPLOYMENT_TARGET=14.0 + MACOSX_DEPLOYMENT_TARGET=11.0 install_pre_requirements_script: | brew install llvm python From 2a839c8b878cd132c57ef9cb6030221f46c814c6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 18 Jan 2024 15:18:19 +0100 Subject: [PATCH 090/179] Set rpath to @loader_path on macos --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad14c2e7..be42fcf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,16 @@ set(CMAKE_CXX_STANDARD_REQUIRED On) set(CMAKE_CXX_EXTENSIONS Off) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) -set(CMAKE_INSTALL_RPATH "$ORIGIN") -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +if(UNIX) + set(CMAKE_INSTALL_RPATH "$ORIGIN") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +elseif(APPLE) + set(CMAKE_INSTALL_RPATH "@loader_path") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +elseif(WIN32) + message(FATAL_ERROR "Windows is not supported") +endif() + set(CMAKE_JOB_POOL_COMPILE "compile") set(CMAKE_JOB_POOL_LINK "link") From a9fba0ab35e050d69f52f1f7dab290ac78564492 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 11:38:34 +0200 Subject: [PATCH 091/179] Print contents of lib directory --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index daf5026e..8d57c077 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,6 +81,7 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: + tree /tmp/vcpkg_installed/arm64-osx-dynamic-cxx17-abi1-rel && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} @@ -97,7 +98,7 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=11.0 install_pre_requirements_script: | - brew install llvm python + brew install llvm python tree python3 -m pip install --upgrade pip python3 -m pip install --upgrade pip install git+https://github.com/pypa/cibuildwheel@main run_cibuildwheel_script: | From c4b624d3628eacd6204b33313c39cb75f7f3bfa3 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 11:45:19 +0200 Subject: [PATCH 092/179] Use @rpath --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be42fcf6..d5d134ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if(UNIX) set(CMAKE_INSTALL_RPATH "$ORIGIN") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) elseif(APPLE) - set(CMAKE_INSTALL_RPATH "@loader_path") + set(CMAKE_INSTALL_RPATH "@rpath") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) elseif(WIN32) message(FATAL_ERROR "Windows is not supported") From 049eb78254c0e4737f77eee3744055d3c12f47df Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 11:52:23 +0200 Subject: [PATCH 093/179] Revert "Print contents of lib directory" This reverts commit a9fba0ab35e050d69f52f1f7dab290ac78564492. --- .cirrus.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8d57c077..daf5026e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,7 +81,6 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: - tree /tmp/vcpkg_installed/arm64-osx-dynamic-cxx17-abi1-rel && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} @@ -98,7 +97,7 @@ macos_arm64_task: MACOSX_DEPLOYMENT_TARGET=11.0 install_pre_requirements_script: | - brew install llvm python tree + brew install llvm python python3 -m pip install --upgrade pip python3 -m pip install --upgrade pip install git+https://github.com/pypa/cibuildwheel@main run_cibuildwheel_script: | From 2e9b6fe5aecd8f714ae0f4779c576160d3508b07 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 11:52:50 +0200 Subject: [PATCH 094/179] Set some Apple Compiler related cmake policies --- CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5d134ce..9bdec136 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,12 @@ cmake_minimum_required(VERSION 3.25) + +# Compiler id for Apple Clang is now AppleClang +cmake_policy(SET CMP0025 NEW) + +# Enable MACOS_RPATH +# https://cmake.org/cmake/help/latest/policy/CMP0042.html +cmake_policy(SET CMP0042 NEW) + cmake_host_system_information(RESULT ncores QUERY NUMBER_OF_PHYSICAL_CORES) enable_testing() @@ -11,7 +19,7 @@ if(UNIX) set(CMAKE_INSTALL_RPATH "$ORIGIN") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) elseif(APPLE) - set(CMAKE_INSTALL_RPATH "@rpath") + set(CMAKE_INSTALL_RPATH "@loader_path") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) elseif(WIN32) message(FATAL_ERROR "Windows is not supported") From f32d8d3c2a9dd2b6d83cce1477ad6e9948e3c796 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 12:04:42 +0200 Subject: [PATCH 095/179] APPLE is a variety of UNIX --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bdec136..e81694eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,15 +16,18 @@ set(CMAKE_CXX_EXTENSIONS Off) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) if(UNIX) - set(CMAKE_INSTALL_RPATH "$ORIGIN") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -elseif(APPLE) - set(CMAKE_INSTALL_RPATH "@loader_path") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + if(APPLE) + set(CMAKE_INSTALL_RPATH "@loader_path") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + else() + set(CMAKE_INSTALL_RPATH "$ORIGIN") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + endif() elseif(WIN32) message(FATAL_ERROR "Windows is not supported") endif() +message(STATUS "CMAKE_INSTALL_RPATH=$CMAKE_INSTALL_RPATH") set(CMAKE_JOB_POOL_COMPILE "compile") set(CMAKE_JOB_POOL_LINK "link") From d58d67d00844d090276e4bef9999e049c6a5e088 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 12:33:48 +0200 Subject: [PATCH 096/179] @loader_path -> @rpath again --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e81694eb..f47da60a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) if(UNIX) if(APPLE) - set(CMAKE_INSTALL_RPATH "@loader_path") + set(CMAKE_INSTALL_RPATH "@rpath") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) else() set(CMAKE_INSTALL_RPATH "$ORIGIN") From 851a47fa81f10b8d1e061d0aa67e170ce58db535 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 12:36:39 +0200 Subject: [PATCH 097/179] Revert "@loader_path -> @rpath again" This reverts commit d58d67d00844d090276e4bef9999e049c6a5e088. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f47da60a..e81694eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) if(UNIX) if(APPLE) - set(CMAKE_INSTALL_RPATH "@rpath") + set(CMAKE_INSTALL_RPATH "@loader_path") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) else() set(CMAKE_INSTALL_RPATH "$ORIGIN") From 6a7a30b850a4ac778a2fe48c02e6623a0a4ddf0c Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 16:29:49 +0200 Subject: [PATCH 098/179] Set CMAKE_INSTALL_NAME_DIR to @rpath on macos --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e81694eb..1f37dfe0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,12 +16,12 @@ set(CMAKE_CXX_EXTENSIONS Off) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) if(UNIX) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) if(APPLE) set(CMAKE_INSTALL_RPATH "@loader_path") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + set(CMAKE_INSTALL_NAME_DIR "@rpath") else() set(CMAKE_INSTALL_RPATH "$ORIGIN") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) endif() elseif(WIN32) message(FATAL_ERROR "Windows is not supported") From 0642cf25eca8839b3517faa46f86b80accedabef Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 Jan 2024 16:35:29 +0200 Subject: [PATCH 099/179] Relative @loader_path/ --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f37dfe0..8abbb26a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) if(UNIX) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) if(APPLE) - set(CMAKE_INSTALL_RPATH "@loader_path") + set(CMAKE_INSTALL_RPATH "@loader_path/") set(CMAKE_INSTALL_NAME_DIR "@rpath") else() set(CMAKE_INSTALL_RPATH "$ORIGIN") From 3409b17b34239f5a6fffc483db6885329829eeaa Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 20:07:37 +0200 Subject: [PATCH 100/179] Upgrade cibuildwheel to 2.16.5 --- .cirrus.yml | 4 ++-- .github/workflows/ci.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index daf5026e..d674932b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==2.16.2 + - python -m pip install cibuildwheel==2.16.5 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: @@ -99,7 +99,7 @@ macos_arm64_task: install_pre_requirements_script: | brew install llvm python python3 -m pip install --upgrade pip - python3 -m pip install --upgrade pip install git+https://github.com/pypa/cibuildwheel@main + python3 -m pip install --upgrade pip install cibuildwheel==2.16.5 run_cibuildwheel_script: | export PATH="/opt/homebrew/opt/llvm/bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f77ce7cd..6671e3aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,7 +130,7 @@ jobs: core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - name: Run cibuildwheel - uses: pypa/cibuildwheel@v2.13.1 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_BUILD: ${{ matrix.python[1] }}-manylinux_x86_64 CIBW_BUILD_FRONTEND: build From 26e0dc355464c1e332f5b952b12da6318290e772 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 20:20:35 +0200 Subject: [PATCH 101/179] Remove python3.8, enable python 3.12 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6671e3aa..2788ee0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,10 +105,10 @@ jobs: # https://peps.python.org/pep-0425 python: # python version, cpython tag - - ["3.8", "cp38"] - ["3.9", "cp39"] - ["3.10", "cp310"] - ["3.11", "cp311"] + - ["3.12", "cp312"] steps: - name: Set up Python ${{ matrix.python[0] }} From a732604de09ba5cd1169175d2d200352ab5b3f4f Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 20:33:21 +0200 Subject: [PATCH 102/179] Include pyarrow library dirs in REPAIR_LIBRARY_PATH --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index d674932b..2162b3b0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,6 +81,8 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: + export PYARROW_LIDIRS=$(python -c "import pyarrow; print(':'.join(pyarrow.get_library_dirs()))") + export REPAIR_LIBRARY_PATH=$PYARROW_LIBDIRS:$REPAIR_LIBRARY_PATH DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} From 38f80ced21bdcd2e67190ca7bce6fb1100df9326 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 21:15:55 +0200 Subject: [PATCH 103/179] Install pyarrow for delocate-wheel --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2162b3b0..fbb6fda3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,7 +81,9 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: - export PYARROW_LIDIRS=$(python -c "import pyarrow; print(':'.join(pyarrow.get_library_dirs()))") + python3 -m pip install --upgrade pip + python3 -m pip install --upgrade pyarrow + export PYARROW_LIBDIRS=$(python -c "import pyarrow; print(':'.join(pyarrow.get_library_dirs()))") export REPAIR_LIBRARY_PATH=$PYARROW_LIBDIRS:$REPAIR_LIBRARY_PATH DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel From 7c217a40ab5f7f5639ca211e3672983d5e1a33ab Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 21:19:02 +0200 Subject: [PATCH 104/179] Spacing --- .cirrus.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index fbb6fda3..ca939df2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -80,18 +80,13 @@ macos_arm64_task: env: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - CIBW_REPAIR_WHEEL_COMMAND_MACOS: + CIBW_REPAIR_WHEEL_COMMAND_MACOS: | python3 -m pip install --upgrade pip python3 -m pip install --upgrade pyarrow export PYARROW_LIBDIRS=$(python -c "import pyarrow; print(':'.join(pyarrow.get_library_dirs()))") export REPAIR_LIBRARY_PATH=$PYARROW_LIBDIRS:$REPAIR_LIBRARY_PATH DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && - DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel - --require-archs {delocate_archs} - -w {dest_dir} - -v {wheel} - --exclude libarrow_python.dylib - --exclude libarrow.1400.dylib + DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1400.dylib CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" From cd3da41dcfb60645f34a99066957ed84dc691174 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 21:27:42 +0200 Subject: [PATCH 105/179] Upgrade to pyarrow 15.0.0 --- .cirrus.yml | 5 +---- .github/workflows/ci.yml | 2 +- pyproject.toml | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ca939df2..138f2ad5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,12 +81,9 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: | - python3 -m pip install --upgrade pip - python3 -m pip install --upgrade pyarrow - export PYARROW_LIBDIRS=$(python -c "import pyarrow; print(':'.join(pyarrow.get_library_dirs()))") export REPAIR_LIBRARY_PATH=$PYARROW_LIBDIRS:$REPAIR_LIBRARY_PATH DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && - DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1400.dylib + DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2788ee0a..f4659115 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,7 +145,7 @@ jobs: VCPKG_INSTALLED_DIR=${{ env.VCPKG_INSTALLED_DIR }} LD_LIBRARY_PATH=${{ env.VCPKG_INSTALLED_DIR }}/${{ env.VCPKG_TARGET_TRIPLET }}/lib CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1400 + auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1500 CIBW_TEST_EXTRAS: applications,test CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae diff --git a/pyproject.toml b/pyproject.toml index 6a7d716d..ddc8b8b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ classifiers = [ ] dependencies = [ "appdirs", - "pyarrow == 14.0.1" + "pyarrow == 15.0.0" ] [project.optional-dependencies] @@ -44,7 +44,7 @@ Repository = "https://github.com/ratt-ru/arcae" requires = [ "cython>=3.0.2", "scikit-build-core", - "pyarrow == 14.0.1"] + "pyarrow == 15.0.0"] build-backend = "scikit_build_core.build" [tools.setuptools.packages] From 510e8235cf625d985de2c374d46a6b4e01d733e1 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 21:31:21 +0200 Subject: [PATCH 106/179] spacing --- .cirrus.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 138f2ad5..14fcd6dc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,8 +81,7 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: | - export REPAIR_LIBRARY_PATH=$PYARROW_LIBDIRS:$REPAIR_LIBRARY_PATH - DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && + DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS=-DBUILD_TESTING=OFF From 735f0a9440562c19d6f17f4408e344f2a782dee5 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 21:41:40 +0200 Subject: [PATCH 107/179] Install pyarrow==15.0.0 prior to delocate-wheel --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 14fcd6dc..9d48cadd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,6 +81,7 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: | + python3 -m pip install --upgrade pyarrow==15.0.0 DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib CIBW_ENVIRONMENT_MACOS: > From 9fda572d4e761ad4942c01b5027c9962dbc61c09 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 21:49:07 +0200 Subject: [PATCH 108/179] Try set the path one last time --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 9d48cadd..c5946e7f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -82,6 +82,8 @@ macos_arm64_task: REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: | python3 -m pip install --upgrade pyarrow==15.0.0 + export PYARROW_LIBDIRS=$(python3 -c "import pyarrow; print(':'.join(pyarrow.get_library_dirs()))") + export REPAIR_LIBRARY_PATH=$PYARROW_LIBDIRS:$REPAIR_LIBRARY_PATH DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib CIBW_ENVIRONMENT_MACOS: > From e0fd453e3e0f4ff202ea13b9d5e067845f173220 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 22:40:03 +0200 Subject: [PATCH 109/179] Try --ignore-missing-dependencies --- .cirrus.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c5946e7f..bf2e5850 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -81,11 +81,8 @@ macos_arm64_task: VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib CIBW_REPAIR_WHEEL_COMMAND_MACOS: | - python3 -m pip install --upgrade pyarrow==15.0.0 - export PYARROW_LIBDIRS=$(python3 -c "import pyarrow; print(':'.join(pyarrow.get_library_dirs()))") - export REPAIR_LIBRARY_PATH=$PYARROW_LIBDIRS:$REPAIR_LIBRARY_PATH - DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} - DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib + DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} --ignore-missing-dependencies + DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib --ignore-missing-dependencies CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS=-DBUILD_TESTING=OFF VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" From 54e49a80ba039bf239f9bf94e333ec439b06bac0 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Sun, 18 Feb 2024 22:59:27 +0200 Subject: [PATCH 110/179] python-casacore doesn't have 3.12 wheels yet --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ddc8b8b4..90df2c70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ dev = [ test = [ "duckdb", "pytest >= 7.0.0", - "python-casacore >= 3.5.0; sys_platform != 'darwin'", + "python-casacore >= 3.5.0; sys_platform != 'darwin' and python_version<'3.12'", "requests" ] From 6677103e9f9e9f20b845d2fc68e1d25abda5533a Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 08:41:42 +0200 Subject: [PATCH 111/179] universal2 macos triplet --- .../universal2-osx-dynamic-cxx17-abi1-rel.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 vcpkg/overlay-triplets/universal2-osx-dynamic-cxx17-abi1-rel.cmake diff --git a/vcpkg/overlay-triplets/universal2-osx-dynamic-cxx17-abi1-rel.cmake b/vcpkg/overlay-triplets/universal2-osx-dynamic-cxx17-abi1-rel.cmake new file mode 100644 index 00000000..943d8f71 --- /dev/null +++ b/vcpkg/overlay-triplets/universal2-osx-dynamic-cxx17-abi1-rel.cmake @@ -0,0 +1,12 @@ +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS Off) + +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) From 21d97a50d191610a81fc2cf71c59d3829f03dee7 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 09:03:50 +0200 Subject: [PATCH 112/179] Rework github actions --- .github/workflows/ci.yml | 68 +++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4659115..4927865e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,10 @@ on: - cron: '30 2 * * 1,4' # Every Monday and Thursday @ 2h30am UTC env: + CIBW_BUILD_FRONTEND: build + CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed - VCPKG_TARGET_TRIPLET: x64-linux-dynamic-cxx17-abi1-rel ARTIFACT_NAME: distribution jobs: @@ -20,14 +22,11 @@ jobs: name: Build Source Distribution runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[skip ci]')" - strategy: - matrix: - python: ["3.8"] steps: - - name: Set up Python ${{ matrix.python }} + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python }} + python-version: "3.10" - name: Upgrade pip and install build run: python -m pip install -U pip build @@ -60,6 +59,9 @@ jobs: with: python-version: ${{ matrix.python }} + - name: Expose GitHub Runtime + uses: crazy-max/ghaction-github-runtime@v3 + - name: List directory structure run: tree @@ -70,13 +72,6 @@ jobs: python -m pip install -U pip python -m pip install pyarrow - - name: Get Github Action Cache Variables - uses: actions/github-script@v6 - with: - script: | - core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); - core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - - name: Build C++ libraries and tests env: VCPKG_BINARY_SOURCES: clear;x-gha,readwrite @@ -103,18 +98,32 @@ jobs: fail-fast: false matrix: # https://peps.python.org/pep-0425 - python: - # python version, cpython tag - - ["3.9", "cp39"] - - ["3.10", "cp310"] - - ["3.11", "cp311"] - - ["3.12", "cp312"] + cpython: ["cp39", "cp310", "cp311", "cp312"] + include: + - os: ubuntu-22.04 + arch: "x86_64" + triplet: "x64-linux-dynamic-cxx17-abi1-rel" + extra_build: "manylinux" + # - os: macos-14 + # arch: "arm64 universal2 x86_64" + # triplet: "universal2-osx-dynamic-cxx17-abi1-rel" + # extra_build: "" + + # Setup Python versions + - cpython: cp39 + python: "3.9" + - cpython: cp310 + python: "3.10" + - cpython: cp311 + python: "3.11" + - cpython: cp312 + python: "3.12" steps: - - name: Set up Python ${{ matrix.python[0] }} + - name: Set up Python ${{ matrix.python }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python[0] }} + python-version: ${{ matrix.python }} - name: Upgrade pip and install virtualenv run: python -m pip install -U pip virtualenv @@ -122,28 +131,21 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - - name: Get Github Action Cache Variables - uses: actions/github-script@v6 - with: - script: | - core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); - core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + - name: Expose GitHub Runtime + uses: crazy-max/ghaction-github-runtime@v3 - name: Run cibuildwheel uses: pypa/cibuildwheel@v2.16.5 env: - CIBW_BUILD: ${{ matrix.python[1] }}-manylinux_x86_64 - CIBW_BUILD_FRONTEND: build - CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 + CIBW_BUILD: ${{ matrix.cpython }}-${{ matrix.extra_build }}* CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS=-DBUILD_TESTING=OFF ACTIONS_CACHE_URL=${{ env.ACTIONS_CACHE_URL }} ACTIONS_RUNTIME_TOKEN=${{ env.ACTIONS_RUNTIME_TOKEN }} VCPKG_BINARY_SOURCES="clear;x-gha,readwrite" - VCPKG_TARGET_TRIPLET=${{ env.VCPKG_TARGET_TRIPLET }} + VCPKG_TARGET_TRIPLET=${{ matrix.triplet }} VCPKG_INSTALLED_DIR=${{ env.VCPKG_INSTALLED_DIR }} - LD_LIBRARY_PATH=${{ env.VCPKG_INSTALLED_DIR }}/${{ env.VCPKG_TARGET_TRIPLET }}/lib + LD_LIBRARY_PATH=${{ env.VCPKG_INSTALLED_DIR }}/${{ matrix.triplet }}/lib CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1500 CIBW_TEST_EXTRAS: applications,test From cb91b9c8e44aeabf80441a21ce4eab17a9a3b541 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 09:16:47 +0200 Subject: [PATCH 113/179] Set triplet for C++ tests --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4927865e..71456c47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,9 @@ jobs: strategy: fail-fast: false + env: + VCPKG_TARGET_TRIPLET: "x64-linux-dynamic-cxx17-abi1-rel" + steps: - name: Checkout source uses: actions/checkout@v4 From bbdaa7282e67ab3c46ffc9173a48d09fa0b11732 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 09:17:05 +0200 Subject: [PATCH 114/179] More specific manylinux --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71456c47..532ae950 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,7 +106,7 @@ jobs: - os: ubuntu-22.04 arch: "x86_64" triplet: "x64-linux-dynamic-cxx17-abi1-rel" - extra_build: "manylinux" + extra_build: "manylinux_x86_64" # - os: macos-14 # arch: "arm64 universal2 x86_64" # triplet: "universal2-osx-dynamic-cxx17-abi1-rel" From 6ba6025f0391f95650fbfe9a52b2414fa14bd1dd Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 09:27:48 +0200 Subject: [PATCH 115/179] Create a common build environment env var --- .github/workflows/ci.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 532ae950..1d41dd70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,11 +137,9 @@ jobs: - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v3 - - name: Run cibuildwheel - uses: pypa/cibuildwheel@v2.16.5 + - name: Set Common Build Environment Variable env: - CIBW_BUILD: ${{ matrix.cpython }}-${{ matrix.extra_build }}* - CIBW_ENVIRONMENT_LINUX: > + COMMON_ENV: > CMAKE_ARGS=-DBUILD_TESTING=OFF ACTIONS_CACHE_URL=${{ env.ACTIONS_CACHE_URL }} ACTIONS_RUNTIME_TOKEN=${{ env.ACTIONS_RUNTIME_TOKEN }} @@ -149,10 +147,18 @@ jobs: VCPKG_TARGET_TRIPLET=${{ matrix.triplet }} VCPKG_INSTALLED_DIR=${{ env.VCPKG_INSTALLED_DIR }} LD_LIBRARY_PATH=${{ env.VCPKG_INSTALLED_DIR }}/${{ matrix.triplet }}/lib + run: echo "CIBW_ENVIRONMENT_COMMON=$COMMON_ENV" >> $GITHUB_ENV + + - name: Run cibuildwheel + uses: pypa/cibuildwheel@v2.16.5 + env: + CIBW_BUILD: ${{ matrix.cpython }}-${{ matrix.extra_build }}* + CIBW_ENVIRONMENT_LINUX: > + ${{ env.CIBW_ENVIRONMENT_COMMON }} CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1500 CIBW_TEST_EXTRAS: applications,test - CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae + CIBW_TEST_COMMAND_LINUX: py.test -s -vvv --pyargs arcae - name: Upload wheel artifacts uses: actions/upload-artifact@v3 From 2bb3ebf113d4a98483eb64a27a678476808ff502 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 09:46:51 +0200 Subject: [PATCH 116/179] Try a github action macos runner --- .github/workflows/ci.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d41dd70..6344ca68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 + CIBW_TEST_EXTRAS: applications,test VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed ARTIFACT_NAME: distribution @@ -95,11 +96,12 @@ jobs: build-wheels: name: Build and Test Binary Wheels - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} if: "!contains(github.event.head_commit.message, '[skip ci]')" strategy: fail-fast: false matrix: + os: ["ubuntu-22-04", "macos-14"] # https://peps.python.org/pep-0425 cpython: ["cp39", "cp310", "cp311", "cp312"] include: @@ -107,10 +109,10 @@ jobs: arch: "x86_64" triplet: "x64-linux-dynamic-cxx17-abi1-rel" extra_build: "manylinux_x86_64" - # - os: macos-14 - # arch: "arm64 universal2 x86_64" - # triplet: "universal2-osx-dynamic-cxx17-abi1-rel" - # extra_build: "" + - os: macos-14 + arch: "arm64 universal2 x86_64" + triplet: "universal2-osx-dynamic-cxx17-abi1-rel" + extra_build: "" # Setup Python versions - cpython: cp39 @@ -153,11 +155,13 @@ jobs: uses: pypa/cibuildwheel@v2.16.5 env: CIBW_BUILD: ${{ matrix.cpython }}-${{ matrix.extra_build }}* - CIBW_ENVIRONMENT_LINUX: > - ${{ env.CIBW_ENVIRONMENT_COMMON }} + CIBW_ENVIRONMENT_LINUX: ${{ env.CIBW_ENVIRONMENT_COMMON }} + CIBW_ENVIRONMENT_MACOS: ${{ env.CIBW_ENVIRONMENT_COMMON }} MACOSX_DEPLOYMENT_TARGET=11.0 CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1500 - CIBW_TEST_EXTRAS: applications,test + CIBW_REPAIR_WHEEL_COMMAND_MACOS: | + DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-listdeps {wheel} + DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib --ignore-missing-dependencies CIBW_TEST_COMMAND_LINUX: py.test -s -vvv --pyargs arcae - name: Upload wheel artifacts From c605c2d7517106384c5634da662b3bdb5ae61e55 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 10:16:17 +0200 Subject: [PATCH 117/179] Use Python 3.10 for host python --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6344ca68..c5e84c13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ env: CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 CIBW_TEST_EXTRAS: applications,test + HOST_PYTHON_VERSION: "3.10" VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed ARTIFACT_NAME: distribution @@ -24,10 +25,10 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[skip ci]')" steps: - - name: Set up Python 3.10 + - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: ${{ env.HOST_PYTHON_VERSION }} - name: Upgrade pip and install build run: python -m pip install -U pip build @@ -58,10 +59,10 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python }} + - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python }} + python-version: ${{ env.HOST_PYTHON_VERSION }} - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v3 From a544a4d6cf40323957c17ec1baf9dc369b6f22bb Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 10:16:35 +0200 Subject: [PATCH 118/179] Install python and llvm in MACOS runner --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5e84c13..e1d40980 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ on: env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + CIBW_BEFORE_ALL_MACOS: brew install python llvm CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 CIBW_TEST_EXTRAS: applications,test HOST_PYTHON_VERSION: "3.10" From c23c2f8510476804451614607880a031a2b2d7ab Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 10:18:18 +0200 Subject: [PATCH 119/179] Use Python 3.10 for host python --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1d40980..6941df2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,10 +127,10 @@ jobs: python: "3.12" steps: - - name: Set up Python ${{ matrix.python }} + - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python }} + python-version: ${{ env.HOST_PYTHON_VERSION }} - name: Upgrade pip and install virtualenv run: python -m pip install -U pip virtualenv From ad93a6a5774e8870cafe5745a33ea128a733cd37 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 10:23:13 +0200 Subject: [PATCH 120/179] Fix ubuntu OS version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6941df2a..baf7d6f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-22-04", "macos-14"] + os: ["ubuntu-22.04", "macos-14"] # https://peps.python.org/pep-0425 cpython: ["cp39", "cp310", "cp311", "cp312"] include: From 1358d953524494fdaa927ad313a68959de9931a2 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 10:25:26 +0200 Subject: [PATCH 121/179] Set up LLVM environment variables --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baf7d6f7..2ca10802 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,11 @@ on: env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran - CIBW_BEFORE_ALL_MACOS: brew install python llvm + CIBW_BEFORE_ALL_MACOS: | + brew install python llvm + export PATH="/opt/homebrew/opt/llvm/bin:$PATH" + export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" + export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 CIBW_TEST_EXTRAS: applications,test HOST_PYTHON_VERSION: "3.10" From 38705e74694c7a4157b828ccdde40854a628c87e Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 10:31:00 +0200 Subject: [PATCH 122/179] Setup macos paths in CIBW_BEFORE_BUILD_MACOS --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ca10802..449a3bec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ env: CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_BEFORE_ALL_MACOS: | brew install python llvm + CIBW_BEFORE_BUILD_MACOS: | export PATH="/opt/homebrew/opt/llvm/bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" From b68c990b0c4a3641493a104595ab258010db1911 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 10:44:07 +0200 Subject: [PATCH 123/179] Set env vars in CIBW_ENVIRONMENT_MACOS --- .github/workflows/ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 449a3bec..b45c5483 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,10 @@ env: CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_BEFORE_ALL_MACOS: | brew install python llvm - CIBW_BEFORE_BUILD_MACOS: | - export PATH="/opt/homebrew/opt/llvm/bin:$PATH" - export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" - export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" + # CIBW_BEFORE_BUILD_MACOS: | + # export PATH="/opt/homebrew/opt/llvm/bin:$PATH" + # export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" + # export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 CIBW_TEST_EXTRAS: applications,test HOST_PYTHON_VERSION: "3.10" @@ -163,7 +163,12 @@ jobs: env: CIBW_BUILD: ${{ matrix.cpython }}-${{ matrix.extra_build }}* CIBW_ENVIRONMENT_LINUX: ${{ env.CIBW_ENVIRONMENT_COMMON }} - CIBW_ENVIRONMENT_MACOS: ${{ env.CIBW_ENVIRONMENT_COMMON }} MACOSX_DEPLOYMENT_TARGET=11.0 + CIBW_ENVIRONMENT_MACOS: > + ${{ env.CIBW_ENVIRONMENT_COMMON }} + PATH="/opt/homebrew/opt/llvm/bin:$PATH" + LDFLAGS="-L/opt/homebrew/opt/llvm/lib" + CPPFLAGS="-I/opt/homebrew/opt/llvm/include" + MACOSX_DEPLOYMENT_TARGET=11.0 CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1500 CIBW_REPAIR_WHEEL_COMMAND_MACOS: | From df39268ad067a998a41ddbc52107c5a41f4ff553 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 11:21:18 +0200 Subject: [PATCH 124/179] tmate --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b45c5483..242d6010 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,6 +182,10 @@ jobs: name: ${{ env.ARTIFACT_NAME }} path: ./wheelhouse/*.whl + - name: Debug with tmate on failure + if: ${{ failure() }} + uses: mxschmitt/action-tmate@v3 + upload-to-test-pypi: name: Upload release to Test PyPI needs: [build-sdist, build-wheels] From b5ee5b2b698de19493ee8b295e6141be45a67cef Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 11:32:59 +0200 Subject: [PATCH 125/179] Try install gfortran with brew --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 242d6010..a7645e89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_BEFORE_ALL_MACOS: | - brew install python llvm + brew install python llvm gfortran # CIBW_BEFORE_BUILD_MACOS: | # export PATH="/opt/homebrew/opt/llvm/bin:$PATH" # export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" From c5270038489095885086d1c28eca0d509c38f10a Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 11:37:46 +0200 Subject: [PATCH 126/179] brew reinstall --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7645e89..edaac1a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_BEFORE_ALL_MACOS: | - brew install python llvm gfortran + brew reinstall python gcc llvm # CIBW_BEFORE_BUILD_MACOS: | # export PATH="/opt/homebrew/opt/llvm/bin:$PATH" # export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" From 915abb8204cba5f7d9bb1e1d2d346dfd85146e83 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 11:55:46 +0200 Subject: [PATCH 127/179] Split macosx builds --- .github/workflows/ci.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edaac1a8..6d65272a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,19 +117,23 @@ jobs: triplet: "x64-linux-dynamic-cxx17-abi1-rel" extra_build: "manylinux_x86_64" - os: macos-14 - arch: "arm64 universal2 x86_64" - triplet: "universal2-osx-dynamic-cxx17-abi1-rel" - extra_build: "" + arch: "arm64" + triplet: "arm64-osx-dynamic-cxx17-abi1-rel" + extra_build: "macosx_arm64" + - os: macos-14 + arch: "x86_64" + triplet: "x64-osx-dynamic-cxx17-abi1-rel" + extra_build: "macosx_x86_64" # Setup Python versions - - cpython: cp39 - python: "3.9" + # - cpython: cp39 + # python: "3.9" - cpython: cp310 python: "3.10" - - cpython: cp311 - python: "3.11" - - cpython: cp312 - python: "3.12" + # - cpython: cp311 + # python: "3.11" + # - cpython: cp312 + # python: "3.12" steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} From 09358caecfb427d7191df6aaec526588b481f8ef Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 12:05:41 +0200 Subject: [PATCH 128/179] Constrain python versions --- .github/workflows/ci.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d65272a..17b93720 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,8 @@ jobs: matrix: os: ["ubuntu-22.04", "macos-14"] # https://peps.python.org/pep-0425 - cpython: ["cp39", "cp310", "cp311", "cp312"] + #cpython: ["cp39", "cp310", "cp311", "cp312"] + cpython: ["cp310", "cp311"] include: - os: ubuntu-22.04 arch: "x86_64" @@ -125,16 +126,6 @@ jobs: triplet: "x64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_x86_64" - # Setup Python versions - # - cpython: cp39 - # python: "3.9" - - cpython: cp310 - python: "3.10" - # - cpython: cp311 - # python: "3.11" - # - cpython: cp312 - # python: "3.12" - steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} uses: actions/setup-python@v4 From b3be65718b78a096ef352651e5b0a0c4404c0b51 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 12:10:34 +0200 Subject: [PATCH 129/179] Add CIBW_ARCHS --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17b93720..92fec41c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,6 +157,7 @@ jobs: uses: pypa/cibuildwheel@v2.16.5 env: CIBW_BUILD: ${{ matrix.cpython }}-${{ matrix.extra_build }}* + CIBW_ARCHS: ${{ matrix.arch }} CIBW_ENVIRONMENT_LINUX: ${{ env.CIBW_ENVIRONMENT_COMMON }} CIBW_ENVIRONMENT_MACOS: > ${{ env.CIBW_ENVIRONMENT_COMMON }} From 915c59688027e3f9ddbce351f7f686cea70d5bb9 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 12:21:16 +0200 Subject: [PATCH 130/179] Disable x86_64 macos for now --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92fec41c..835b8dd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,10 +121,10 @@ jobs: arch: "arm64" triplet: "arm64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_arm64" - - os: macos-14 - arch: "x86_64" - triplet: "x64-osx-dynamic-cxx17-abi1-rel" - extra_build: "macosx_x86_64" + # - os: macos-14 + # arch: "x86_64" + # triplet: "x64-osx-dynamic-cxx17-abi1-rel" + # extra_build: "macosx_x86_64" steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} From bdcb728b41dfa672320e39da47463bceb65d9fda Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 12:55:38 +0200 Subject: [PATCH 131/179] macos-13 seems to be the intel runner --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 835b8dd7..bc58ba36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-22.04", "macos-14"] + os: ["ubuntu-22.04", "macos-13", "macos-14"] # https://peps.python.org/pep-0425 #cpython: ["cp39", "cp310", "cp311", "cp312"] cpython: ["cp310", "cp311"] @@ -117,14 +117,14 @@ jobs: arch: "x86_64" triplet: "x64-linux-dynamic-cxx17-abi1-rel" extra_build: "manylinux_x86_64" + - os: macos-13 + arch: "x86_64" + triplet: "x64-osx-dynamic-cxx17-abi1-rel" + extra_build: "macosx_x86_64" - os: macos-14 arch: "arm64" triplet: "arm64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_arm64" - # - os: macos-14 - # arch: "x86_64" - # triplet: "x64-osx-dynamic-cxx17-abi1-rel" - # extra_build: "macosx_x86_64" steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} @@ -178,9 +178,9 @@ jobs: name: ${{ env.ARTIFACT_NAME }} path: ./wheelhouse/*.whl - - name: Debug with tmate on failure - if: ${{ failure() }} - uses: mxschmitt/action-tmate@v3 + # - name: Debug with tmate on failure + # if: ${{ failure() }} + # uses: mxschmitt/action-tmate@v3 upload-to-test-pypi: name: Upload release to Test PyPI From a98c460da5f84960cf9051c064512e9bb0961bd4 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 13:07:11 +0200 Subject: [PATCH 132/179] Force brew reinstalls --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc58ba36..4953e74d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_BEFORE_ALL_MACOS: | - brew reinstall python gcc llvm + brew reinstall python gcc llvm --force # CIBW_BEFORE_BUILD_MACOS: | # export PATH="/opt/homebrew/opt/llvm/bin:$PATH" # export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" From 28956420a8fed3076f9754fa1c3f2971b3c84019 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 13:17:26 +0200 Subject: [PATCH 133/179] Try remove python first, then install with --overwrite --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4953e74d..3376dfa9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,8 @@ env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_BEFORE_ALL_MACOS: | - brew reinstall python gcc llvm --force + brew uninstall python + brew install python gcc llvm --overwrite # CIBW_BEFORE_BUILD_MACOS: | # export PATH="/opt/homebrew/opt/llvm/bin:$PATH" # export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" From c69d7df9918409163f1251e2befdfb427c50ba21 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 13:24:25 +0200 Subject: [PATCH 134/179] Correct cirrus amd64 linux auditwheel command --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index bf2e5850..f9a167ec 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,7 +14,7 @@ env: CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so - --exclude libarrow.so.1400 + --exclude libarrow.so.1500 # There's no python-casacore wheel for amd64-linux or macosx # CIBW_TEST_EXTRAS: test # CIBW_TEST_COMMAND: py.test -s -vvv --pyargs arcae From a90721b780f2d132dbbf34b52cd23a5a965bc087 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 13:24:48 +0200 Subject: [PATCH 135/179] brew install python llvm; brew reinstall gcc --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3376dfa9..896f9c62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,9 +13,10 @@ on: env: CIBW_BUILD_FRONTEND: build CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran + # Need to reinstall gcc in order to get gfortran CIBW_BEFORE_ALL_MACOS: | - brew uninstall python - brew install python gcc llvm --overwrite + brew install python llvm + brew reinstall gcc # CIBW_BEFORE_BUILD_MACOS: | # export PATH="/opt/homebrew/opt/llvm/bin:$PATH" # export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" From 9291e1037862a2682a0eb971a7a106b9293ed834 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 14:08:26 +0200 Subject: [PATCH 136/179] Rearrange macos path setting --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 896f9c62..6d3072b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,10 @@ env: CIBW_BEFORE_ALL_MACOS: | brew install python llvm brew reinstall gcc - # CIBW_BEFORE_BUILD_MACOS: | - # export PATH="/opt/homebrew/opt/llvm/bin:$PATH" - # export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" - # export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" + CIBW_BEFORE_BUILD_MACOS: | + export PATH="/opt/homebrew/opt/llvm/bin:$PATH" + export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" + export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 CIBW_TEST_EXTRAS: applications,test HOST_PYTHON_VERSION: "3.10" @@ -163,9 +163,6 @@ jobs: CIBW_ENVIRONMENT_LINUX: ${{ env.CIBW_ENVIRONMENT_COMMON }} CIBW_ENVIRONMENT_MACOS: > ${{ env.CIBW_ENVIRONMENT_COMMON }} - PATH="/opt/homebrew/opt/llvm/bin:$PATH" - LDFLAGS="-L/opt/homebrew/opt/llvm/lib" - CPPFLAGS="-I/opt/homebrew/opt/llvm/include" MACOSX_DEPLOYMENT_TARGET=11.0 CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1500 From cb12d891b4f32cc354ba26953448e72bd610dba9 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 14:15:28 +0200 Subject: [PATCH 137/179] Upgrade to actions/setup-python@v5 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d3072b1..c301ca99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[skip ci]')" steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.HOST_PYTHON_VERSION }} @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.HOST_PYTHON_VERSION }} @@ -130,7 +130,7 @@ jobs: steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.HOST_PYTHON_VERSION }} From 689ac5a6c42c682c84da7052206b77092333f775 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 14:16:56 +0200 Subject: [PATCH 138/179] Upgrade to actions/upload-artifact@v4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c301ca99..10f475e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: run: python -m build --sdist - name: Upload wheel artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} path: ./dist/*.tar.gz @@ -172,7 +172,7 @@ jobs: CIBW_TEST_COMMAND_LINUX: py.test -s -vvv --pyargs arcae - name: Upload wheel artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} path: ./wheelhouse/*.whl From 1ce10e8eb54270340bd601938705bb89920a763d Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 14:24:48 +0200 Subject: [PATCH 139/179] upload-artifact@v4 migration --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10f475e6..682980d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,7 +174,7 @@ jobs: - name: Upload wheel artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.ARTIFACT_NAME }} + name: ${{ env.ARTIFACT_NAME }}-${{ matrix.os }}-${{ matrix.cpython }} path: ./wheelhouse/*.whl # - name: Debug with tmate on failure @@ -193,7 +193,8 @@ jobs: - name: Download distribution artifacts uses: actions/download-artifact@v3 with: - name: ${{ env.ARTIFACT_NAME }} + pattern: ${{ env.ARTIFACT_NAME }}-* + merge-multiple: true path: dist - name: List artifacts From 1c1adff2ddccfee56cddc6197e4142d0b25c0bcc Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 14:36:49 +0200 Subject: [PATCH 140/179] Upgrade to actions/download-artifact@v4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 682980d1..af2d19d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,7 +218,7 @@ jobs: id-token: write steps: - name: Download distribution artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} path: dist From bfe914414d76813256e44df6636e770b485d9299 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 14:45:52 +0200 Subject: [PATCH 141/179] fixes --- .github/workflows/ci.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af2d19d7..73394673 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ env: CIBW_TEST_EXTRAS: applications,test HOST_PYTHON_VERSION: "3.10" VCPKG_INSTALLED_DIR: /tmp/vcpkg_installed - ARTIFACT_NAME: distribution + ARTIFACT_NAME: wheel jobs: build-sdist: @@ -50,7 +50,7 @@ jobs: - name: Upload wheel artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.ARTIFACT_NAME }} + name: ${{ env.ARTIFACT_NAME }}-source path: ./dist/*.tar.gz cpp-tests: @@ -116,14 +116,17 @@ jobs: cpython: ["cp310", "cp311"] include: - os: ubuntu-22.04 + os_short: linux arch: "x86_64" triplet: "x64-linux-dynamic-cxx17-abi1-rel" extra_build: "manylinux_x86_64" - os: macos-13 + os_short: macos arch: "x86_64" triplet: "x64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_x86_64" - os: macos-14 + os_short: macos arch: "arm64" triplet: "arm64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_arm64" @@ -174,7 +177,7 @@ jobs: - name: Upload wheel artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.ARTIFACT_NAME }}-${{ matrix.os }}-${{ matrix.cpython }} + name: ${{ env.ARTIFACT_NAME }}-${{ matrix.os_short }}-${{ matrix.arch }} path: ./wheelhouse/*.whl # - name: Debug with tmate on failure @@ -191,7 +194,7 @@ jobs: id-token: write steps: - name: Download distribution artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: pattern: ${{ env.ARTIFACT_NAME }}-* merge-multiple: true @@ -220,7 +223,8 @@ jobs: - name: Download distribution artifacts uses: actions/download-artifact@v4 with: - name: ${{ env.ARTIFACT_NAME }} + pattern: ${{ env.ARTIFACT_NAME }}-* + merge-multiple: true path: dist - name: List artifacts From 3626b1bb890c5c0faa9d501f3cd4965d4a8cd982 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 14:52:35 +0200 Subject: [PATCH 142/179] Add further dinstinctiveness to upload artifact names --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73394673..9cb6ae0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -177,7 +177,7 @@ jobs: - name: Upload wheel artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.ARTIFACT_NAME }}-${{ matrix.os_short }}-${{ matrix.arch }} + name: ${{ env.ARTIFACT_NAME }}-${{ matrix.os_short }}-${{ matrix.cpython }}-${{ matrix.arch }} path: ./wheelhouse/*.whl # - name: Debug with tmate on failure From a451cc3ccf011dadcaf433e3294b1f6fee367cc1 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 15:54:21 +0200 Subject: [PATCH 143/179] formatting --- .github/workflows/ci.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9cb6ae0c..89d183c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -168,10 +168,19 @@ jobs: ${{ env.CIBW_ENVIRONMENT_COMMON }} MACOSX_DEPLOYMENT_TARGET=11.0 CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} --exclude libarrow_python.so --exclude libarrow.so.1500 + auditwheel repair + -w {dest_dir} {wheel} + --exclude libarrow_python.so + --exclude libarrow.so.1500 CIBW_REPAIR_WHEEL_COMMAND_MACOS: | DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-listdeps {wheel} - DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib --ignore-missing-dependencies + DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-wheel \ + --require-archs {delocate_archs} \ + -w {dest_dir} \ + -v {wheel} \ + --exclude libarrow_python.dylib \ + --exclude libarrow.1500.dylib \ + --ignore-missing-dependencies CIBW_TEST_COMMAND_LINUX: py.test -s -vvv --pyargs arcae - name: Upload wheel artifacts From 59d21d10782480f8bd72cba3259d0f53d380333c Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 17:59:46 +0200 Subject: [PATCH 144/179] fix indent --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89d183c9..cc0ca025 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,9 +169,9 @@ jobs: MACOSX_DEPLOYMENT_TARGET=11.0 CIBW_REPAIR_WHEEL_COMMAND_LINUX: > auditwheel repair - -w {dest_dir} {wheel} - --exclude libarrow_python.so - --exclude libarrow.so.1500 + -w {dest_dir} {wheel} + --exclude libarrow_python.so + --exclude libarrow.so.1500 CIBW_REPAIR_WHEEL_COMMAND_MACOS: | DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-listdeps {wheel} DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-wheel \ From 83a4fd64634eba86070dfccf9407023c250b9ca4 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 18:49:56 +0200 Subject: [PATCH 145/179] More indent niceties --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc0ca025..991d98cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,12 +174,12 @@ jobs: --exclude libarrow.so.1500 CIBW_REPAIR_WHEEL_COMMAND_MACOS: | DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-listdeps {wheel} - DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-wheel \ - --require-archs {delocate_archs} \ - -w {dest_dir} \ - -v {wheel} \ - --exclude libarrow_python.dylib \ - --exclude libarrow.1500.dylib \ + DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-wheel + --require-archs {delocate_archs} + -w {dest_dir} + -v {wheel} + --exclude libarrow_python.dylib + --exclude libarrow.1500.dylib --ignore-missing-dependencies CIBW_TEST_COMMAND_LINUX: py.test -s -vvv --pyargs arcae From e08234e527f555e66fb7ddfc6e053190eb29be40 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 18:56:19 +0200 Subject: [PATCH 146/179] Revert "More indent niceties" This reverts commit 83a4fd64634eba86070dfccf9407023c250b9ca4. --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 991d98cb..cc0ca025 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,12 +174,12 @@ jobs: --exclude libarrow.so.1500 CIBW_REPAIR_WHEEL_COMMAND_MACOS: | DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-listdeps {wheel} - DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-wheel - --require-archs {delocate_archs} - -w {dest_dir} - -v {wheel} - --exclude libarrow_python.dylib - --exclude libarrow.1500.dylib + DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH delocate-wheel \ + --require-archs {delocate_archs} \ + -w {dest_dir} \ + -v {wheel} \ + --exclude libarrow_python.dylib \ + --exclude libarrow.1500.dylib \ --ignore-missing-dependencies CIBW_TEST_COMMAND_LINUX: py.test -s -vvv --pyargs arcae From 7b4693e9da07d062bfda0527d05739b2f40cbefb Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 19 Feb 2024 20:01:23 +0200 Subject: [PATCH 147/179] Remove wcslib overlay port --- vcpkg/overlay-ports/wcslib/portfile.cmake | 29 ----------------------- vcpkg/overlay-ports/wcslib/usage | 6 ----- vcpkg/overlay-ports/wcslib/vcpkg.json | 7 ------ 3 files changed, 42 deletions(-) delete mode 100644 vcpkg/overlay-ports/wcslib/portfile.cmake delete mode 100644 vcpkg/overlay-ports/wcslib/usage delete mode 100644 vcpkg/overlay-ports/wcslib/vcpkg.json diff --git a/vcpkg/overlay-ports/wcslib/portfile.cmake b/vcpkg/overlay-ports/wcslib/portfile.cmake deleted file mode 100644 index 0c5c5c7c..00000000 --- a/vcpkg/overlay-ports/wcslib/portfile.cmake +++ /dev/null @@ -1,29 +0,0 @@ -vcpkg_download_distfile(archive - URLS "http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib-8.2.1.tar.bz2" - FILENAME "wcslib-8.2.1.tar.bz2" - SHA512 0d1ab63445974c2a4f425225cde197866187a9e7ae0195a33dcb33ad299018294338bc16ab4cbe6a3a27fb40aded75c60377348eaa91713d16a934cd95532c25 -) - -vcpkg_extract_source_archive( - src - ARCHIVE "${archive}" -) - -vcpkg_configure_make( - SOURCE_PATH ${src} - COPY_SOURCE - OPTIONS - --disable-debug - --disable-dependency-tracking - --disable-flex - --disable-fortran - --without-pgplot - --without-cfitsio) - -vcpkg_install_make(MAKEFILE GNUmakefile) -vcpkg_fixup_pkgconfig() -vcpkg_install_copyright(FILE_LIST "${src}/COPYING") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/vcpkg/overlay-ports/wcslib/usage b/vcpkg/overlay-ports/wcslib/usage deleted file mode 100644 index 00db7980..00000000 --- a/vcpkg/overlay-ports/wcslib/usage +++ /dev/null @@ -1,6 +0,0 @@ -wcslib can be imported via CMake FindPkgConfig module: - - find_package(PkgConfig) - pkg_check_modules(wcslib REQUIRED IMPORTED_TARGET wcslib) - target_include_directories(main PRIVATE PkgConfig::wcslib) - target_link_libraries(main PRIVATE PkgConfig::wcslib) diff --git a/vcpkg/overlay-ports/wcslib/vcpkg.json b/vcpkg/overlay-ports/wcslib/vcpkg.json deleted file mode 100644 index 85273064..00000000 --- a/vcpkg/overlay-ports/wcslib/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "wcslib", - "version": "8.2.1", - "description": "World Coordinate System (WCS) (Library)", - "homepage": "https://www.atnf.csiro.au/people/mcalabre/WCS/", - "supports": "!windows" -} From f73521760491887d0dd7ddcef1ac50e79b0c0930 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 11:23:14 +0200 Subject: [PATCH 148/179] Rename ci.yml to wheels.yml --- .github/workflows/{ci.yml => wheels.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{ci.yml => wheels.yml} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/wheels.yml similarity index 100% rename from .github/workflows/ci.yml rename to .github/workflows/wheels.yml From 25a0add51bdc070338a7ae679d35512091e6be67 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 11:23:47 +0200 Subject: [PATCH 149/179] Continuous Integration -> wheels --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index cc0ca025..4fa04e22 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,4 +1,4 @@ -name: Continuous Integration +name: wheels on: push: From dfad29f2352e1dd16e546f7200cac9314b6357a0 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 11:36:22 +0200 Subject: [PATCH 150/179] Split jobs into wheel builds and uploads --- .github/workflows/upload.yml | 57 ++++++++++++++++++++++++++++++++++++ .github/workflows/wheels.yml | 48 ------------------------------ 2 files changed, 57 insertions(+), 48 deletions(-) create mode 100644 .github/workflows/upload.yml diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml new file mode 100644 index 00000000..e4ed8bc6 --- /dev/null +++ b/.github/workflows/upload.yml @@ -0,0 +1,57 @@ +name: upload + +env: + ARTIFACT_NAME: wheel + +on: + workflow_run: + workflows: ["wheels"] + types: ["completed"] + +jobs: + upload-to-test-pypi: + name: Upload release to Test PyPI + runs-on: ubuntu-latest + environment: + name: release-test + permissions: + id-token: write + steps: + - name: Download distribution artifacts + uses: actions/download-artifact@v4 + with: + pattern: ${{ env.ARTIFACT_NAME }}-* + merge-multiple: true + path: dist + + - name: List artifacts + run: ls -lh dist + + - name: Publish package distributions to Test PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ + skip-existing: true + continue-on-error: true + + upload-to-pypi: + name: Upload release to PyPI + needs: [build-sdist, build-wheels] + runs-on: ubuntu-latest + environment: + name: release + permissions: + id-token: write + steps: + - name: Download distribution artifacts + uses: actions/download-artifact@v4 + with: + pattern: ${{ env.ARTIFACT_NAME }}-* + merge-multiple: true + path: dist + + - name: List artifacts + run: ls -lh dist + + - name: Publish package distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4fa04e22..948a4466 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -193,51 +193,3 @@ jobs: # if: ${{ failure() }} # uses: mxschmitt/action-tmate@v3 - upload-to-test-pypi: - name: Upload release to Test PyPI - needs: [build-sdist, build-wheels] - runs-on: ubuntu-latest - environment: - name: release-test - permissions: - id-token: write - steps: - - name: Download distribution artifacts - uses: actions/download-artifact@v4 - with: - pattern: ${{ env.ARTIFACT_NAME }}-* - merge-multiple: true - path: dist - - - name: List artifacts - run: ls -lh dist - - - name: Publish package distributions to Test PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/ - skip-existing: true - continue-on-error: true - - upload-to-pypi: - name: Upload release to PyPI - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') - needs: [build-sdist, build-wheels] - runs-on: ubuntu-latest - environment: - name: release - permissions: - id-token: write - steps: - - name: Download distribution artifacts - uses: actions/download-artifact@v4 - with: - pattern: ${{ env.ARTIFACT_NAME }}-* - merge-multiple: true - path: dist - - - name: List artifacts - run: ls -lh dist - - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 From 556ff024bf1991a5b6eb0ecc29607a018301f5cc Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 11:38:47 +0200 Subject: [PATCH 151/179] Fix indent --- .github/workflows/upload.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml index e4ed8bc6..a88f3798 100644 --- a/.github/workflows/upload.yml +++ b/.github/workflows/upload.yml @@ -5,8 +5,8 @@ env: on: workflow_run: - workflows: ["wheels"] - types: ["completed"] + workflows: ["wheels"] + types: ["completed"] jobs: upload-to-test-pypi: From ac52f37f911d532c764526f9843d7104fc74dec7 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 11:57:15 +0200 Subject: [PATCH 152/179] fix types --- .github/workflows/upload.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml index a88f3798..0d5ab944 100644 --- a/.github/workflows/upload.yml +++ b/.github/workflows/upload.yml @@ -6,7 +6,8 @@ env: on: workflow_run: workflows: ["wheels"] - types: ["completed"] + types: + - completed jobs: upload-to-test-pypi: From 6ca6f7273498c55cfa7d70b5218503ea9bb3aff5 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 11:58:36 +0200 Subject: [PATCH 153/179] Remove cirrus macos arm64 task --- .cirrus.yml | 48 +----------------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f9a167ec..859e556b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -56,50 +56,4 @@ linux_aarch64_task: VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR VCPKG_FORCE_SYSTEM_BINARIES=1 VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - -macos_arm64_task: - name: Build macOS arm64 ${PYTHON_VERSION_NAME} wheels. - macos_instance: - image: ghcr.io/cirruslabs/macos-sonoma-xcode - - matrix: - - env: - PYTHON_VERSION_NAME: python 3.9 - CIBW_BUILD: cp39-* - # - env: - # PYTHON_VERSION_NAME: python 3.10 - # CIBW_BUILD: cp310-* - # - env: - # PYTHON_VERSION_NAME: python 3.11 - # CIBW_BUILD: cp311-* - # - env: - # PYTHON_VERSION_NAME: python 3.12 - # CIBW_BUILD: cp312-* - - env: - VCPKG_TARGET_TRIPLET: arm64-osx-dynamic-cxx17-abi1-rel - REPAIR_LIBRARY_PATH: $VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib - CIBW_REPAIR_WHEEL_COMMAND_MACOS: | - DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} --ignore-missing-dependencies - DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} --exclude libarrow_python.dylib --exclude libarrow.1500.dylib --ignore-missing-dependencies - CIBW_ENVIRONMENT_MACOS: > - CMAKE_ARGS=-DBUILD_TESTING=OFF - VCPKG_BINARY_SOURCES="clear;http,http://127.0.0.1:12321/{name}/{version}/{sha},readwrite" - VCPKG_INSTALLED_DIR=$VCPKG_INSTALLED_DIR - VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET - REPAIR_LIBRARY_PATH=$REPAIR_LIBRARY_PATH - MACOSX_DEPLOYMENT_TARGET=11.0 - - install_pre_requirements_script: | - brew install llvm python - python3 -m pip install --upgrade pip - python3 -m pip install --upgrade pip install cibuildwheel==2.16.5 - run_cibuildwheel_script: | - export PATH="/opt/homebrew/opt/llvm/bin:$PATH" - export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" - export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" - echo "CIBW_ENVIRONMENT_MACOS=$CIBW_ENVIRONMENT_MACOS" - cibuildwheel - wheels_artifacts: - path: "wheelhouse/*" \ No newline at end of file + LD_LIBRARY_PATH=$VCPKG_INSTALLED_DIR/$VCPKG_TARGET_TRIPLET/lib \ No newline at end of file From f2442e78d1ecf84ec80f0ae1b3646b80bbfa7ee0 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 12:10:22 +0200 Subject: [PATCH 154/179] Remove quotes from workflow name --- .github/workflows/upload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml index 0d5ab944..96aed532 100644 --- a/.github/workflows/upload.yml +++ b/.github/workflows/upload.yml @@ -5,7 +5,7 @@ env: on: workflow_run: - workflows: ["wheels"] + workflows: [wheels] types: - completed From 52a4bf6b41fa89379cc9ae3f8867f7c6d4ef906b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 12:35:24 +0200 Subject: [PATCH 155/179] Rename upload to deploy --- .github/workflows/{upload.yml => deploy.yml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{upload.yml => deploy.yml} (99%) diff --git a/.github/workflows/upload.yml b/.github/workflows/deploy.yml similarity index 99% rename from .github/workflows/upload.yml rename to .github/workflows/deploy.yml index 96aed532..88cf4a91 100644 --- a/.github/workflows/upload.yml +++ b/.github/workflows/deploy.yml @@ -1,7 +1,4 @@ -name: upload - -env: - ARTIFACT_NAME: wheel +name: deploy on: workflow_run: @@ -9,6 +6,9 @@ on: types: - completed +env: + ARTIFACT_NAME: wheel + jobs: upload-to-test-pypi: name: Upload release to Test PyPI From ed54c07048e6f9feac84360cbdb6ce296cf26c8e Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 14:47:25 +0200 Subject: [PATCH 156/179] Disable cirrus ci temporarily --- .cirrus.yml => .tmp.cirrus.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cirrus.yml => .tmp.cirrus.yml (100%) diff --git a/.cirrus.yml b/.tmp.cirrus.yml similarity index 100% rename from .cirrus.yml rename to .tmp.cirrus.yml From 9c7b092a5fd93a51bbe2f3ec5175c7bf2acf5433 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 15:39:44 +0200 Subject: [PATCH 157/179] Revert "Disable cirrus ci temporarily" This reverts commit ed54c07048e6f9feac84360cbdb6ce296cf26c8e. --- .tmp.cirrus.yml => .cirrus.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .tmp.cirrus.yml => .cirrus.yml (100%) diff --git a/.tmp.cirrus.yml b/.cirrus.yml similarity index 100% rename from .tmp.cirrus.yml rename to .cirrus.yml From 4a8ac34c37f6f57f116132ccc5fa33bca1c64e66 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 15:39:48 +0200 Subject: [PATCH 158/179] Revert "Rename upload to deploy" This reverts commit 52a4bf6b41fa89379cc9ae3f8867f7c6d4ef906b. --- .github/workflows/{deploy.yml => upload.yml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{deploy.yml => upload.yml} (99%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/upload.yml similarity index 99% rename from .github/workflows/deploy.yml rename to .github/workflows/upload.yml index 88cf4a91..96aed532 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/upload.yml @@ -1,4 +1,7 @@ -name: deploy +name: upload + +env: + ARTIFACT_NAME: wheel on: workflow_run: @@ -6,9 +9,6 @@ on: types: - completed -env: - ARTIFACT_NAME: wheel - jobs: upload-to-test-pypi: name: Upload release to Test PyPI From dbfe7863f63bbed13d87bae512b0a2be1ac8afb5 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 15:39:49 +0200 Subject: [PATCH 159/179] Revert "Remove quotes from workflow name" This reverts commit f2442e78d1ecf84ec80f0ae1b3646b80bbfa7ee0. --- .github/workflows/upload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml index 96aed532..0d5ab944 100644 --- a/.github/workflows/upload.yml +++ b/.github/workflows/upload.yml @@ -5,7 +5,7 @@ env: on: workflow_run: - workflows: [wheels] + workflows: ["wheels"] types: - completed From b5fe722965f22f7f900be1aa78340b8b94431d95 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 15:39:52 +0200 Subject: [PATCH 160/179] Revert "fix types" This reverts commit ac52f37f911d532c764526f9843d7104fc74dec7. --- .github/workflows/upload.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml index 0d5ab944..a88f3798 100644 --- a/.github/workflows/upload.yml +++ b/.github/workflows/upload.yml @@ -6,8 +6,7 @@ env: on: workflow_run: workflows: ["wheels"] - types: - - completed + types: ["completed"] jobs: upload-to-test-pypi: From abfb802dc7f537028cd78d266f1d4acb228ee765 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 15:39:54 +0200 Subject: [PATCH 161/179] Revert "Fix indent" This reverts commit 556ff024bf1991a5b6eb0ecc29607a018301f5cc. --- .github/workflows/upload.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml index a88f3798..e4ed8bc6 100644 --- a/.github/workflows/upload.yml +++ b/.github/workflows/upload.yml @@ -5,8 +5,8 @@ env: on: workflow_run: - workflows: ["wheels"] - types: ["completed"] + workflows: ["wheels"] + types: ["completed"] jobs: upload-to-test-pypi: From fe2e281e24ac3f830149653d7885206a6248280a Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 15:39:56 +0200 Subject: [PATCH 162/179] Revert "Split jobs into wheel builds and uploads" This reverts commit dfad29f2352e1dd16e546f7200cac9314b6357a0. --- .github/workflows/upload.yml | 57 ------------------------------------ .github/workflows/wheels.yml | 48 ++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 57 deletions(-) delete mode 100644 .github/workflows/upload.yml diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml deleted file mode 100644 index e4ed8bc6..00000000 --- a/.github/workflows/upload.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: upload - -env: - ARTIFACT_NAME: wheel - -on: - workflow_run: - workflows: ["wheels"] - types: ["completed"] - -jobs: - upload-to-test-pypi: - name: Upload release to Test PyPI - runs-on: ubuntu-latest - environment: - name: release-test - permissions: - id-token: write - steps: - - name: Download distribution artifacts - uses: actions/download-artifact@v4 - with: - pattern: ${{ env.ARTIFACT_NAME }}-* - merge-multiple: true - path: dist - - - name: List artifacts - run: ls -lh dist - - - name: Publish package distributions to Test PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/ - skip-existing: true - continue-on-error: true - - upload-to-pypi: - name: Upload release to PyPI - needs: [build-sdist, build-wheels] - runs-on: ubuntu-latest - environment: - name: release - permissions: - id-token: write - steps: - - name: Download distribution artifacts - uses: actions/download-artifact@v4 - with: - pattern: ${{ env.ARTIFACT_NAME }}-* - merge-multiple: true - path: dist - - - name: List artifacts - run: ls -lh dist - - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 948a4466..4fa04e22 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -193,3 +193,51 @@ jobs: # if: ${{ failure() }} # uses: mxschmitt/action-tmate@v3 + upload-to-test-pypi: + name: Upload release to Test PyPI + needs: [build-sdist, build-wheels] + runs-on: ubuntu-latest + environment: + name: release-test + permissions: + id-token: write + steps: + - name: Download distribution artifacts + uses: actions/download-artifact@v4 + with: + pattern: ${{ env.ARTIFACT_NAME }}-* + merge-multiple: true + path: dist + + - name: List artifacts + run: ls -lh dist + + - name: Publish package distributions to Test PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ + skip-existing: true + continue-on-error: true + + upload-to-pypi: + name: Upload release to PyPI + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + needs: [build-sdist, build-wheels] + runs-on: ubuntu-latest + environment: + name: release + permissions: + id-token: write + steps: + - name: Download distribution artifacts + uses: actions/download-artifact@v4 + with: + pattern: ${{ env.ARTIFACT_NAME }}-* + merge-multiple: true + path: dist + + - name: List artifacts + run: ls -lh dist + + - name: Publish package distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 From 3211baa04fd2136f69561bae75cd400b338dea6a Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 15:39:57 +0200 Subject: [PATCH 163/179] Revert "Continuous Integration -> wheels" This reverts commit 25a0add51bdc070338a7ae679d35512091e6be67. --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4fa04e22..cc0ca025 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,4 +1,4 @@ -name: wheels +name: Continuous Integration on: push: From 33b5a54e1bcf69b4766b8d26fc5eed1ab2e24cc1 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 20 Feb 2024 15:39:59 +0200 Subject: [PATCH 164/179] Revert "Rename ci.yml to wheels.yml" This reverts commit f73521760491887d0dd7ddcef1ac50e79b0c0930. --- .github/workflows/{wheels.yml => ci.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{wheels.yml => ci.yml} (100%) diff --git a/.github/workflows/wheels.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/workflows/wheels.yml rename to .github/workflows/ci.yml From 8453858343157fdbcd6fbf2096dda55635e945e1 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 21 Feb 2024 16:18:53 +0200 Subject: [PATCH 165/179] [skip ci] Update HISTORY.rst --- HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.rst b/HISTORY.rst index 94fbb36f..09f66a96 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,7 @@ History X.Y.Z (YYYY-MM-DD) ------------------ +* Build linux arm64 and macos arm64/x86_64 wheels (:pr:`76`) * Upgrade vcpkg version to include wcslib 8.2.1 (:pr:`82`) * Export compile_commands.json by default (:pr:`81`) * Make export application dependencies optional (:pr:`80`) From 972566b2108570c295fa145d0bfd543a8e29e9f7 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Wed, 21 Feb 2024 16:20:45 +0200 Subject: [PATCH 166/179] Build full range of cpython versions --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc0ca025..956cfd0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,8 +112,7 @@ jobs: matrix: os: ["ubuntu-22.04", "macos-13", "macos-14"] # https://peps.python.org/pep-0425 - #cpython: ["cp39", "cp310", "cp311", "cp312"] - cpython: ["cp310", "cp311"] + cpython: ["cp39", "cp310", "cp311", "cp312"] include: - os: ubuntu-22.04 os_short: linux From fb884ee3bc9a61dfe80b949e467deb78541cef44 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 11:33:41 +0200 Subject: [PATCH 167/179] catch ImportErrors produced in multiprocessing.Pool and skip --- src/arcae/tests/conftest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/arcae/tests/conftest.py b/src/arcae/tests/conftest.py index a2eb8417..8f32d55b 100644 --- a/src/arcae/tests/conftest.py +++ b/src/arcae/tests/conftest.py @@ -285,7 +285,10 @@ def generate_column_cases_table(path): def casa_table_at_path(factory, *args): with mp.get_context("spawn").Pool(1) as pool: - return pool.apply(factory, args) + try: + return pool.apply_async(factory, args).get() + except ImportError as e: + pytest.importorskip(e.name) @pytest.fixture From 580c1352bee6d9ac3c0b9c3bbb78d0ef9982344c Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 11:40:42 +0200 Subject: [PATCH 168/179] Remove tablelocking --- vcpkg/manifest/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg/manifest/vcpkg.json b/vcpkg/manifest/vcpkg.json index 68d05018..0dab9f24 100644 --- a/vcpkg/manifest/vcpkg.json +++ b/vcpkg/manifest/vcpkg.json @@ -3,7 +3,7 @@ { "name": "casacore", "default-features": false, - "features": ["dysco", "tablelocking", "threads"] + "features": ["dysco", "threads"] }, "gtest" ] From 6559b7497641407fa78edd61ecd3298fdd1f3a17 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 11:46:33 +0200 Subject: [PATCH 169/179] [skip ci] Update HISTORY.rst --- HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.rst b/HISTORY.rst index 09f66a96..a694834a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,7 @@ History X.Y.Z (YYYY-MM-DD) ------------------ +* Upgrade to pyarrow 15.0.0 (:pr:`76`) * Build linux arm64 and macos arm64/x86_64 wheels (:pr:`76`) * Upgrade vcpkg version to include wcslib 8.2.1 (:pr:`82`) * Export compile_commands.json by default (:pr:`81`) From bed2b0eae98909d48e9e577c6e70ef393e54eea6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 12:11:19 +0200 Subject: [PATCH 170/179] Only build all wheels in master --- .cirrus.yml | 3 +++ .github/workflows/ci.yml | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 859e556b..25e44b48 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,12 +37,15 @@ linux_aarch64_task: - env: PYTHON_VERSION_NAME: python 3.9 CIBW_BUILD: cp39-manylinux* + only_if: $CIRRUS_BRANCH == 'main' - env: PYTHON_VERSION_NAME: python 3.10 CIBW_BUILD: cp310-manylinux* + only_if: $CIRRUS_BRANCH == 'main' - env: PYTHON_VERSION_NAME: python 3.11 CIBW_BUILD: cp311-manylinux* + only_if: $CIRRUS_BRANCH == 'main' - env: PYTHON_VERSION_NAME: python 3.12 CIBW_BUILD: cp312-manylinux* diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 956cfd0b..4a39f00a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,6 +110,7 @@ jobs: strategy: fail-fast: false matrix: + is_main: ${{ contains(github.ref, 'main') }} os: ["ubuntu-22.04", "macos-13", "macos-14"] # https://peps.python.org/pep-0425 cpython: ["cp39", "cp310", "cp311", "cp312"] @@ -129,6 +130,14 @@ jobs: arch: "arm64" triplet: "arm64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_arm64" + # Avoid building all wheels in a PR + exclude: + - is_main: false + cpython: "cp39" + - is_main: false + cpython: "cp10" + - is_main: false + cpython: "cp11" steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} From d042ae84e46a280af75c34586a00bc3ba7e1d673 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 12:19:22 +0200 Subject: [PATCH 171/179] Fix cpython versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a39f00a..311d60de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,9 +135,9 @@ jobs: - is_main: false cpython: "cp39" - is_main: false - cpython: "cp10" + cpython: "cp310" - is_main: false - cpython: "cp11" + cpython: "cp311" steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} From 43f5a039bc5ea17925774c2ebf7dbc07c40cd0b1 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 12:26:58 +0200 Subject: [PATCH 172/179] Quotes, maybe --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 311d60de..e9a9f775 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,11 +133,11 @@ jobs: # Avoid building all wheels in a PR exclude: - is_main: false - cpython: "cp39" + cpython: cp39 - is_main: false - cpython: "cp310" + cpython: cp310 - is_main: false - cpython: "cp311" + cpython: cp311 steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} From 804e3eab339f23b658fc81e4ed73a195efe2f72f Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 12:30:09 +0200 Subject: [PATCH 173/179] Rearrange --- .github/workflows/ci.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9a9f775..98fc0950 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,6 +114,14 @@ jobs: os: ["ubuntu-22.04", "macos-13", "macos-14"] # https://peps.python.org/pep-0425 cpython: ["cp39", "cp310", "cp311", "cp312"] + # Avoid building all wheels in a PR + exclude: + - is_main: false + cpython: cp39 + - is_main: false + cpython: cp310 + - is_main: false + cpython: cp311 include: - os: ubuntu-22.04 os_short: linux @@ -130,15 +138,6 @@ jobs: arch: "arm64" triplet: "arm64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_arm64" - # Avoid building all wheels in a PR - exclude: - - is_main: false - cpython: cp39 - - is_main: false - cpython: cp310 - - is_main: false - cpython: cp311 - steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} uses: actions/setup-python@v5 From 1d98c55b1c293a7b1aa6b0d7e0618d857824638b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 12:34:28 +0200 Subject: [PATCH 174/179] Always include cp312 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98fc0950..68437f12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,6 +138,7 @@ jobs: arch: "arm64" triplet: "arm64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_arm64" + - cpython: cp312 steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} uses: actions/setup-python@v5 From 42e4b431dae5add480c06c3e395d833f38bb9465 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 14:09:28 +0200 Subject: [PATCH 175/179] Remove cp311 from exclude --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68437f12..f7d9b26d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,8 +120,6 @@ jobs: cpython: cp39 - is_main: false cpython: cp310 - - is_main: false - cpython: cp311 include: - os: ubuntu-22.04 os_short: linux @@ -138,7 +136,6 @@ jobs: arch: "arm64" triplet: "arm64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_arm64" - - cpython: cp312 steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} uses: actions/setup-python@v5 From 7085e199f1aba1ffbb9618e00e23192aacd12cd3 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 14:13:28 +0200 Subject: [PATCH 176/179] is_main should be a list --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7d9b26d..55b69c06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,7 @@ jobs: strategy: fail-fast: false matrix: - is_main: ${{ contains(github.ref, 'main') }} + is_main: [${{ contains(github.ref, 'main') }}] os: ["ubuntu-22.04", "macos-13", "macos-14"] # https://peps.python.org/pep-0425 cpython: ["cp39", "cp310", "cp311", "cp312"] From 9e41594e76b54d2416fd6e76ce08bd72c1c83e71 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 14:14:08 +0200 Subject: [PATCH 177/179] Revert "Remove cp311 from exclude" This reverts commit 42e4b431dae5add480c06c3e395d833f38bb9465. --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55b69c06..7c00dc80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,6 +120,8 @@ jobs: cpython: cp39 - is_main: false cpython: cp310 + - is_main: false + cpython: cp311 include: - os: ubuntu-22.04 os_short: linux @@ -136,6 +138,7 @@ jobs: arch: "arm64" triplet: "arm64-osx-dynamic-cxx17-abi1-rel" extra_build: "macosx_arm64" + - cpython: cp312 steps: - name: Set up Python ${{ env.HOST_PYTHON_VERSION }} uses: actions/setup-python@v5 From 8be95f1011161da3745f612b1ce69310770edc9b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 14:15:23 +0200 Subject: [PATCH 178/179] is_main list --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c00dc80..07b3110f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,8 @@ jobs: strategy: fail-fast: false matrix: - is_main: [${{ contains(github.ref, 'main') }}] + is_main: + - ${{ contains(github.ref, 'main') }} os: ["ubuntu-22.04", "macos-13", "macos-14"] # https://peps.python.org/pep-0425 cpython: ["cp39", "cp310", "cp311", "cp312"] From b39f0d4dcf466cad2d1c5416246aa1468930c7a0 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 22 Feb 2024 14:19:18 +0200 Subject: [PATCH 179/179] [skip ci] rearrange --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07b3110f..3344602a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,11 +110,11 @@ jobs: strategy: fail-fast: false matrix: - is_main: - - ${{ contains(github.ref, 'main') }} os: ["ubuntu-22.04", "macos-13", "macos-14"] # https://peps.python.org/pep-0425 cpython: ["cp39", "cp310", "cp311", "cp312"] + is_main: + - ${{ contains(github.ref, 'main') }} # Avoid building all wheels in a PR exclude: - is_main: false