From 72da3feac8a2f62b74e9e481d266cb638b3dafb9 Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 17:14:32 -0500 Subject: [PATCH 01/12] fetch full depth --- .github/workflows/build_wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 8ad4285..c26d341 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -21,6 +21,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch full history, necessary for git describe in setup.py - name: Print status run: | From f91c8ffee9c8a7391f7ef8f8c5142ec61b01aa1b Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 17:17:45 -0500 Subject: [PATCH 02/12] run requirements can't be specified with install_requires in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 19280c3..e5b5c1f 100644 --- a/setup.py +++ b/setup.py @@ -375,7 +375,7 @@ def install(self): package_data={ 'charm4py': ['libcharm_version'], }, - install_requires=['numpy>=1.10.0', 'greenlet>=3.0.0', 'cython>=3.0.0', 'cmake'], + #install_requires=['numpy>=1.10.0', 'greenlet>=3.0.0', 'cython>=3.0.0', 'cmake'], ext_modules=extensions, cmdclass = {'build_py': custom_build_py, 'build_ext': custom_build_ext, From 6f719a022a032acacd1af9a2c607fd00f0718358 Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 17:23:13 -0500 Subject: [PATCH 03/12] adding charm_src checkout --- .github/workflows/build_wheels.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index c26d341..a03c44c 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -24,13 +24,12 @@ jobs: with: fetch-depth: 0 # Fetch full history, necessary for git describe in setup.py - - name: Print status - run: | - echo "Building wheels for ${{ matrix.os }}" - pwd - ls - git --help - git describe --help + - name: Checkout charm_src # is this best practice? should we use a submodule? + uses: actions/checkout@v4 + with: + repository: charmplusplus/charm + token: ${{ secrets.GITHUB_TOKEN }} + path: charm_src/charm - name: Build wheels uses: pypa/cibuildwheel@v2.20.0 From 6cf8cc07fb25e726aabff26da36908776a98d4ee Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 17:25:58 -0500 Subject: [PATCH 04/12] removing windows build for the moment --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index a03c44c..f168d27 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest, windows-latest, macos-13, macos-14] + os: [ubuntu-latest, macos-13, macos-14] steps: - uses: actions/checkout@v4 From dcf7c7bfbda05c271297ae475d60abab0751f1a8 Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 17:37:31 -0500 Subject: [PATCH 05/12] debugging check_libcharm_version --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index e5b5c1f..1fe0175 100644 --- a/setup.py +++ b/setup.py @@ -103,6 +103,7 @@ def check_libcharm_version(charm_src_dir): with open(os.path.join(os.getcwd(), 'charm4py', 'libcharm_version'), 'r') as f: req_version = tuple(int(n) for n in f.read().split('.')) commit_id_str = ctypes.c_char_p.in_dll(lib, "CmiCommitID").value.decode() + print("commit_id_str", commit_id_str) version = [int(n) for n in commit_id_str.split('-')[0][1:].split('.')] try: version = tuple(version + [int(commit_id_str.split('-')[1])]) From aa666f59516293d9fed039830a66b03b0b878e9d Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 17:45:08 -0500 Subject: [PATCH 06/12] checkout full history of charm_src --- .github/workflows/build_wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index f168d27..6031006 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -30,6 +30,7 @@ jobs: repository: charmplusplus/charm token: ${{ secrets.GITHUB_TOKEN }} path: charm_src/charm + fetch-depth: 0 # Fetch full history, necessary for commit_str parsing in setup.py - name: Build wheels uses: pypa/cibuildwheel@v2.20.0 From 1c6db76fd39881e8bf0a17faabd5ac7622da48a1 Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 18:23:20 -0500 Subject: [PATCH 07/12] debugging check cffi --- .github/workflows/build_wheels.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 6031006..4d2b5e1 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest, macos-13, macos-14] + os: [ubuntu-latest] #, macos-13, macos-14] steps: - uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index 1fe0175..48b4a7a 100644 --- a/setup.py +++ b/setup.py @@ -119,6 +119,7 @@ def check_libcharm_version(charm_src_dir): def check_cffi(): try: import cffi + print("cffi version", cffi.__version__) version = tuple(int(v) for v in cffi.__version__.split('.')) if version < (1, 7): raise DistutilsSetupError('Charm4py requires cffi >= 1.7. ' From 3008e26a56eb9624e3c9dcf28882d3cf0a3c9eaa Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 18:40:03 -0500 Subject: [PATCH 08/12] remove pypy build --- .github/workflows/build_wheels.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 4d2b5e1..b25fcd2 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest] #, macos-13, macos-14] + os: [ubuntu-latest, macos-13, macos-14] steps: - uses: actions/checkout@v4 @@ -33,6 +33,8 @@ jobs: fetch-depth: 0 # Fetch full history, necessary for commit_str parsing in setup.py - name: Build wheels + env: + CIBW_SKIP: pp* uses: pypa/cibuildwheel@v2.20.0 with: package-dir: . From 62197c148e511323b26b33b416979d73653e0b6c Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 19:03:01 -0500 Subject: [PATCH 09/12] restrict archs --- .github/workflows/build_wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index b25fcd2..3f2b9f5 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -35,6 +35,8 @@ jobs: - name: Build wheels env: CIBW_SKIP: pp* + CIBW_ARCHS: "x86_64,arm64" + uses: pypa/cibuildwheel@v2.20.0 with: package-dir: . From 2d3d5d670786df5c4064afa9d533d486902e5a6a Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 19:08:51 -0500 Subject: [PATCH 10/12] restrict archs --- .github/workflows/build_wheels.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 3f2b9f5..a47bdd8 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -34,8 +34,7 @@ jobs: - name: Build wheels env: - CIBW_SKIP: pp* - CIBW_ARCHS: "x86_64,arm64" + CIBW_SKIP: "pp*, *-manylinux_i686, *-manylinux_ppc64le, *-manylinux_s390x" uses: pypa/cibuildwheel@v2.20.0 with: From c703d87912ab4e7a220dc5835c7eafdcad4125d0 Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 19:26:31 -0500 Subject: [PATCH 11/12] formatting --- .github/workflows/build_wheels.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index a47bdd8..1a1ad77 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -34,8 +34,7 @@ jobs: - name: Build wheels env: - CIBW_SKIP: "pp*, *-manylinux_i686, *-manylinux_ppc64le, *-manylinux_s390x" - + CIBW_SKIP: "pp* *-manylinux_i686 *-manylinux_ppc64le *-manylinux_s390x" uses: pypa/cibuildwheel@v2.20.0 with: package-dir: . From 2fca5b1f4474267013a2f85ec43302818ae88fea Mon Sep 17 00:00:00 2001 From: mayantaylor Date: Sun, 4 Aug 2024 19:50:06 -0500 Subject: [PATCH 12/12] adding musllinux --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 1a1ad77..098488a 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -34,7 +34,7 @@ jobs: - name: Build wheels env: - CIBW_SKIP: "pp* *-manylinux_i686 *-manylinux_ppc64le *-manylinux_s390x" + CIBW_SKIP: "pp* *-manylinux_i686 *-manylinux_ppc64le *-manylinux_s390x *musllinux_*" uses: pypa/cibuildwheel@v2.20.0 with: package-dir: .