From c002fbb787c4db6943bfb5c76d53c7bd9b195ac2 Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 19:24:49 +0000 Subject: [PATCH 1/9] update python version to 3.12 --- .github/workflows/release_wheels.yml | 2 +- .github/workflows/testing_wheels.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_wheels.yml b/.github/workflows/release_wheels.yml index 11545eeb..7a008e67 100644 --- a/.github/workflows/release_wheels.yml +++ b/.github/workflows/release_wheels.yml @@ -50,7 +50,7 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v2 with: - python-version: '3.11' + python-version: '3.12' - name: Install cibuildwheel and twine run: python -m pip install cibuildwheel==2.12.3 diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index 263a2669..bc93dd69 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -55,7 +55,7 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v2 with: - python-version: '3.11' + python-version: '3.12' - name: Install cibuildwheel and twine run: python -m pip install cibuildwheel==2.12.3 From 4d788ae2f9f39429d83b3c6067a0e2abebd8f40f Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 19:45:46 +0000 Subject: [PATCH 2/9] maybe this --- .github/workflows/testing_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index bc93dd69..34ecb13e 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -29,7 +29,7 @@ jobs: name: manylinux2014 cibw: arch: x86_64 - build: "cp37* cp38* cp39* cp310* cp311* cp312*" + build: ["cp37*", "cp38*", "cp39*", "cp310*, "cp311*", "cp312*"] manylinux_image: manylinux2014 - os: windows-2019 name: win_amd64 @@ -41,7 +41,7 @@ jobs: CIBW_SKIP: "*musllinux*" CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}" CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}" - CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm && brew link --overwrite python@3.11 && brew link --force libomp" + CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm && brew link --overwrite python@3.12 && brew link --force libomp" CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-listdeps {wheel} && delocate-wheel --verbose --require-archs {delocate_archs} -w {dest_dir} {wheel}" # to install latest delocate package CIBW_DEPENDENCY_VERSIONS: "latest" From 46ff53c19655b641847ad46613184bdde68cddb4 Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 19:46:14 +0000 Subject: [PATCH 3/9] build 3.12 first --- .github/workflows/testing_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index 34ecb13e..3521fd01 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -29,7 +29,7 @@ jobs: name: manylinux2014 cibw: arch: x86_64 - build: ["cp37*", "cp38*", "cp39*", "cp310*, "cp311*", "cp312*"] + build: ["cp312*", "cp37*", "cp38*", "cp39*", "cp310*, "cp311*"] manylinux_image: manylinux2014 - os: windows-2019 name: win_amd64 From 975ecbc49a2f3586cc9005ac6c3cb3582e213f91 Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 19:49:44 +0000 Subject: [PATCH 4/9] fix syntax --- .github/workflows/testing_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index 3521fd01..a9571fb2 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -29,7 +29,7 @@ jobs: name: manylinux2014 cibw: arch: x86_64 - build: ["cp312*", "cp37*", "cp38*", "cp39*", "cp310*, "cp311*"] + build: "cp312* cp37* cp38* cp39* cp310* cp311*" manylinux_image: manylinux2014 - os: windows-2019 name: win_amd64 From 3d2975956f77fcd3978910cb30573479705c1a00 Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 19:56:38 +0000 Subject: [PATCH 5/9] upgrade cibuildwheel --- .github/workflows/testing_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index a9571fb2..f6c13685 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -29,7 +29,7 @@ jobs: name: manylinux2014 cibw: arch: x86_64 - build: "cp312* cp37* cp38* cp39* cp310* cp311*" + build: "cp312*" #"cp37* cp38* cp39* cp310* cp311*" manylinux_image: manylinux2014 - os: windows-2019 name: win_amd64 @@ -58,7 +58,7 @@ jobs: python-version: '3.12' - name: Install cibuildwheel and twine - run: python -m pip install cibuildwheel==2.12.3 + run: python -m pip install cibuildwheel==2.16.2 - name: Install requirements run: python -m pip install -r requirements.txt From 9d69534b01fb959ab61146a2753336170b273538 Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 19:56:56 +0000 Subject: [PATCH 6/9] skip for now --- .github/workflows/testing_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index f6c13685..2bfbd74c 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -63,8 +63,8 @@ jobs: - name: Install requirements run: python -m pip install -r requirements.txt - - name: Run C++ tests - run: bash build_tools/test_libs.sh + # - name: Run C++ tests + # run: bash build_tools/test_libs.sh - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse From 8dbb6007f7c2bebf9bd1312fd179f0b088e66182 Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 19:59:37 +0000 Subject: [PATCH 7/9] clean up --- .github/workflows/release_wheels.yml | 6 +++--- .github/workflows/testing_wheels.yml | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release_wheels.yml b/.github/workflows/release_wheels.yml index 7a008e67..4eeb81cd 100644 --- a/.github/workflows/release_wheels.yml +++ b/.github/workflows/release_wheels.yml @@ -30,7 +30,7 @@ jobs: name: win_amd64 architecture: x64 cibw: - build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64" + build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64" env: CIBW_BUILD: "${{ matrix.cibw.build || '*' }}" CIBW_SKIP: "*musllinux*" @@ -50,10 +50,10 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v2 with: - python-version: '3.12' + python-version: '3.11' - name: Install cibuildwheel and twine - run: python -m pip install cibuildwheel==2.12.3 + run: python -m pip install cibuildwheel==2.16.2 - name: Install requirements run: python -m pip install -r requirements.txt diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index 2bfbd74c..ffcb26fa 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -29,19 +29,19 @@ jobs: name: manylinux2014 cibw: arch: x86_64 - build: "cp312*" #"cp37* cp38* cp39* cp310* cp311*" + build: "cp37* cp38* cp39* cp310* cp311* cp312*" manylinux_image: manylinux2014 - os: windows-2019 name: win_amd64 architecture: x64 cibw: - build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64" + build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64" env: CIBW_BUILD: "${{ matrix.cibw.build || '*' }}" CIBW_SKIP: "*musllinux*" CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}" CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}" - CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm && brew link --overwrite python@3.12 && brew link --force libomp" + CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm && brew link --overwrite python@3.11 && brew link --force libomp" CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-listdeps {wheel} && delocate-wheel --verbose --require-archs {delocate_archs} -w {dest_dir} {wheel}" # to install latest delocate package CIBW_DEPENDENCY_VERSIONS: "latest" @@ -55,16 +55,16 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v2 with: - python-version: '3.12' + python-version: 'cibuildwheel==2.16.2' - name: Install cibuildwheel and twine - run: python -m pip install cibuildwheel==2.16.2 + run: python -m pip install cibuildwheel==2.12.3 - name: Install requirements run: python -m pip install -r requirements.txt - # - name: Run C++ tests - # run: bash build_tools/test_libs.sh + - name: Run C++ tests + run: bash build_tools/test_libs.sh - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse From a793ac3d99adc003bfaad8be08b6d1a7ade13992 Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 20:01:51 +0000 Subject: [PATCH 8/9] fix --- .github/workflows/testing_wheels.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index ffcb26fa..470afd35 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -35,7 +35,7 @@ jobs: name: win_amd64 architecture: x64 cibw: - build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64" + build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64" env: CIBW_BUILD: "${{ matrix.cibw.build || '*' }}" CIBW_SKIP: "*musllinux*" @@ -55,10 +55,10 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v2 with: - python-version: 'cibuildwheel==2.16.2' + python-version: '3.11' - name: Install cibuildwheel and twine - run: python -m pip install cibuildwheel==2.12.3 + run: python -m pip install cibuildwheel==2.16.2 - name: Install requirements run: python -m pip install -r requirements.txt From 420315c34a0a5b0bc47bd4ed678926b78b960440 Mon Sep 17 00:00:00 2001 From: Noureldin Date: Fri, 9 Feb 2024 20:02:27 +0000 Subject: [PATCH 9/9] windows --- .github/workflows/testing_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index 470afd35..de263fe6 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -35,7 +35,7 @@ jobs: name: win_amd64 architecture: x64 cibw: - build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64" + build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64" env: CIBW_BUILD: "${{ matrix.cibw.build || '*' }}" CIBW_SKIP: "*musllinux*"