From b5f6193636c5b429c15a0b2c41c42457267abae3 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 12 Sep 2024 14:10:03 +0200 Subject: [PATCH 1/8] revert --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index 11f81ac..607a3ac 100755 --- a/setup.py +++ b/setup.py @@ -32,9 +32,6 @@ libdirs.append("/usr/local/opt/libxml2/lib") includedirs.append("/usr/local/opt/libxml2/include") includedirs.append("/usr/local/opt/libxml2/include/libxml2") - includedirs.append("/usr/local/opt/ticcutils/include") - includedirs.append("/usr/local/opt/libfolia/include") - includedirs.append("/usr/local/opt/ucto/include") #libdirs.append("/usr/local/opt/libtextcat/lib") #includedirs.append("/usr/local/opt/libtextcat/include/libtextcat") From b3d7081eeb67e58bc84f00b5db347bc835cb027b Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 12 Sep 2024 14:13:32 +0200 Subject: [PATCH 2/8] ci: debug --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 72ce51e..c583fb2 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -40,6 +40,8 @@ jobs: CIBW_BEFORE_ALL_MACOS: > brew tap fbkarsdorp/homebrew-lamachine && brew install ucto + find /usr/ -type f -name "*folia*" || true + find /opt/ -type f -name "*folia*" || true CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64 CIBW_SKIP: "*-win* *-manylinux_i686 pp*" From 89a9dbd0980a5e6cfc561ff779d4692163f18606 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 12 Sep 2024 14:17:53 +0200 Subject: [PATCH 3/8] debug --- .github/workflows/wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c583fb2..c098a53 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -40,8 +40,8 @@ jobs: CIBW_BEFORE_ALL_MACOS: > brew tap fbkarsdorp/homebrew-lamachine && brew install ucto - find /usr/ -type f -name "*folia*" || true - find /opt/ -type f -name "*folia*" || true + find /usr/ -name "*folia*" || true + find /opt/ -name "*folia*" || true CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64 CIBW_SKIP: "*-win* *-manylinux_i686 pp*" From c4c2b175718af35f1fe3b3ccb4ed60d86ca99265 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 12 Sep 2024 14:20:13 +0200 Subject: [PATCH 4/8] debug --- .github/workflows/wheels.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c098a53..6b3195b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -39,9 +39,8 @@ jobs: ./build-deps.sh CIBW_BEFORE_ALL_MACOS: > brew tap fbkarsdorp/homebrew-lamachine && - brew install ucto - find /usr/ -name "*folia*" || true - find /opt/ -name "*folia*" || true + brew install ucto && + find /usr/ -name "*folia*" && find /opt/ -name "*folia*" CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64 CIBW_SKIP: "*-win* *-manylinux_i686 pp*" From 0b429c264857f23723122e0f3e7271e916c828cd Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 12 Sep 2024 14:25:37 +0200 Subject: [PATCH 5/8] debug --- .github/workflows/wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6b3195b..fe65d59 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -39,8 +39,8 @@ jobs: ./build-deps.sh CIBW_BEFORE_ALL_MACOS: > brew tap fbkarsdorp/homebrew-lamachine && - brew install ucto && - find /usr/ -name "*folia*" && find /opt/ -name "*folia*" + brew install ucto; + find /usr/local/ -name "*folia*" || true; find /opt/homebrew -name "*folia*" || true CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64 CIBW_SKIP: "*-win* *-manylinux_i686 pp*" From 62052a138fa33afdb6e11d20f99bad62b2ac0820 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 12 Sep 2024 14:39:05 +0200 Subject: [PATCH 6/8] ci: macos-13 is intel, macos-14 is ARM --- .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 fe65d59..587acc4 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macOS-latest] + os: [ubuntu-20.04, macOS-13] steps: - uses: actions/checkout@v3 From 895930e8238fc812ce42b17c3778141a7461a7a3 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 12 Sep 2024 15:17:41 +0200 Subject: [PATCH 7/8] ci: redoing wheel building for mac (trying to also support ARM) --- .github/workflows/wheels.yml | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 587acc4..37706cf 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -10,22 +10,27 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macOS-13] + buildplat: + - { runs_on: ubuntu-20.04, sys: manylinux, arch: x86_64, benv: "" } + - { runs_on: macos-12, sys: macosx, arch: x86_64, benv: "12.0" } + - { runs_on: macos-14, sys: macosx, arch: arm64, benv: "14.0" } steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.1.1 # Used to host cibuildwheel - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 + with: + python-version: 3.11 - name: Install cibuildwheel run: python -m pip install cibuildwheel - - name: Build wheels + - name: Build wheels (Linux) + if: ${{ runner.os != 'macOS' }} run: python -m cibuildwheel --output-dir wheelhouse env: CIBW_ARCHS_LINUX: "x86_64" - CIBW_ARCHS_MACOS: "x86_64" CIBW_BEFORE_ALL_LINUX: > if command -v apt-get; then apt-get -y git libicu-dev libxml2-dev libexttextcat-dev libxslt1-dev libbz2-dev zlib1g-dev autoconf automake autoconf-archive libtool autotools-dev gcc g++ make @@ -37,13 +42,19 @@ jobs: rsync -av --ignore-existing /usr/share/aclocal/*.m4 /usr/local/share/aclocal/ fi && ./build-deps.sh - CIBW_BEFORE_ALL_MACOS: > - brew tap fbkarsdorp/homebrew-lamachine && - brew install ucto; - find /usr/local/ -name "*folia*" || true; find /opt/homebrew -name "*folia*" || true CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64 CIBW_SKIP: "*-win* *-manylinux_i686 pp*" - - uses: actions/upload-artifact@v3 + - name: Build wheels (macOS) + if: ${{ runner.os == 'macOS' }} + run: python -m cibuildwheel --output-dir wheelhouse + env: + CIBW_ARCHS: ${{ matrix.buildplat.arch }} + CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET=${{ matrix.buildplat.benv }}" + CIBW_BEFORE_ALL_MACOS: > + brew tap fbkarsdorp/homebrew-lamachine && + brew install ucto + + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl From d1bc920defe67c59229c65ac3d3c8e6c47ff3862 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 12 Sep 2024 15:22:21 +0200 Subject: [PATCH 8/8] update --- .github/workflows/wheels.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 37706cf..446baf2 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -6,14 +6,19 @@ on: [workflow_dispatch] jobs: build_wheels: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} + name: Build wheels on for ${{matrix.python.cp}}-${{ matrix.buildplat.sys }} + runs-on: ${{ matrix.buildplat.runs_on }} strategy: matrix: buildplat: - { runs_on: ubuntu-20.04, sys: manylinux, arch: x86_64, benv: "" } - { runs_on: macos-12, sys: macosx, arch: x86_64, benv: "12.0" } - { runs_on: macos-14, sys: macosx, arch: arm64, benv: "14.0" } + python: + - { cp: "cp39", rel: "3.9" } + - { cp: "cp310", rel: "3.10" } + - { cp: "cp311", rel: "3.11" } + - { cp: "cp312", rel: "3.12" } steps: - uses: actions/checkout@v4.1.1 @@ -30,6 +35,7 @@ jobs: if: ${{ runner.os != 'macOS' }} run: python -m cibuildwheel --output-dir wheelhouse env: + CIBW_BUILD: ${{ matrix.python.cp }}-${{ matrix.buildplat.sys }}* CIBW_ARCHS_LINUX: "x86_64" CIBW_BEFORE_ALL_LINUX: > if command -v apt-get; then @@ -49,6 +55,7 @@ jobs: if: ${{ runner.os == 'macOS' }} run: python -m cibuildwheel --output-dir wheelhouse env: + CIBW_BUILD: ${{ matrix.python.cp }}-${{ matrix.buildplat.sys }}* CIBW_ARCHS: ${{ matrix.buildplat.arch }} CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET=${{ matrix.buildplat.benv }}" CIBW_BEFORE_ALL_MACOS: > @@ -57,4 +64,5 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: ${{matrix.python.cp}}-${{matrix.buildplat.sys}}-${{matrix.buildplat.arch}} path: ./wheelhouse/*.whl