Skip to content

Commit cb05309

Browse files
fixing CD
1 parent 1fa96c6 commit cb05309

6 files changed

Lines changed: 282 additions & 265 deletions

File tree

.github/workflows/on-release-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Set MACOSX_DEPLOYMENT_TARGET used by cibuildwheel
4747
if: ${{ startsWith(matrix.os, 'macos') }}
48-
run: echo "MACOSX_DEPLOYMENT_TARGET=${{ matrix.os == 'macos-14' && '14.0' || '13.0' }}" >> $GITHUB_ENV
48+
run: echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
4949

5050
- name: Run cibuildwheel
5151
run: |

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ __pycache__/
99

1010
# C extensions
1111
*.so
12+
*.dylib
13+
*.dll
1214

1315
# Distribution / packaging
1416
.Python
@@ -18,7 +20,7 @@ dist/
1820
downloads/
1921
eggs/
2022
.eggs/
21-
lib/
23+
2224
lib64/
2325
parts/
2426
sdist/

build.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,20 @@ def main() -> None:
8080
if shared_lib.exists():
8181
shutil.copy(shared_lib, libvcell_lib_dir / f"libvcell.{ext}")
8282

83+
# Copy the shared library to libvcell/lib
84+
copied = False
85+
for ext in ["so", "dylib", "dll"]:
86+
shared_lib = vcell_native_dir / f"target/libvcell.{ext}"
87+
if shared_lib.exists():
88+
shutil.copy(shared_lib, libvcell_lib_dir / f"libvcell.{ext}")
89+
copied = True
90+
print(f"Copied {shared_lib} to {libvcell_lib_dir}")
91+
92+
if not copied:
93+
print(f"ERROR: No shared library found in {vcell_native_dir / 'target'}", file=sys.stderr)
94+
print(f"Contents: {list((vcell_native_dir / 'target').glob('*'))}", file=sys.stderr)
95+
sys.exit(1)
96+
8397

8498
if __name__ == "__main__":
8599
main()

libvcell/lib/.gitkeep

Whitespace-only changes.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "libvcell"
7-
version = "0.0.13"
7+
version = "0.0.14.4"
88
description = "This is a python package which wraps a subset of VCell Java code as a native python package."
99
authors = ["Jim Schaff <schaff@uchc.edu>", "Ezequiel Valencia <evalencia@uchc.edu>"]
1010
repository = "https://github.com/virtualcell/libvcell"
@@ -39,6 +39,7 @@ mkdocs-material = "^9.5.50"
3939
mkdocstrings = {extras = ["python"], version = "^0.27.0"}
4040

4141
[tool.cibuildwheel]
42+
build-frontend = "pip"
4243
build = "cp311-* cp312-* cp313-*"
4344
manylinux-x86_64-image = "ghcr.io/virtualcell/manylinux_2_28_x86_64:0.0.1"
4445
skip = "cp311-musllinux_x86_64 cp312-musllinux_x86_64 cp313-musllinux_x86_64"

0 commit comments

Comments
 (0)