Skip to content

Commit

Permalink
one /CMakeLists.txt with with OPTION_TARGET_PYTHON_BINDING [true]
Browse files Browse the repository at this point in the history
  • Loading branch information
jcschaff committed Jun 2, 2024
1 parent bde32e3 commit 73a7fc0
Show file tree
Hide file tree
Showing 16 changed files with 137 additions and 624 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ jobs:
-G Ninja \
-DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang \
-DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ \
-DOPTION_TARGET_PYTHON_BINDING=OFF \
-DOPTION_MINGW=ON \
-DOPTION_TARGET_MESSAGING=OFF \
-DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
Expand All @@ -128,6 +129,7 @@ jobs:
-G Ninja \
-DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang \
-DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \
-DOPTION_TARGET_PYTHON_BINDING=OFF \
-DOPTION_MINGW=ON \
-DOPTION_TARGET_MESSAGING=OFF \
-DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
Expand Down Expand Up @@ -205,6 +207,7 @@ jobs:
-G Ninja \
-DCMAKE_C_COMPILER="clang.exe" \
-DCMAKE_CXX_COMPILER="clang++.exe" \
-DOPTION_TARGET_PYTHON_BINDING=OFF \
-DOPTION_TARGET_MESSAGING=OFF \
-DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
-DOPTION_TARGET_FV_SOLVER=ON \
Expand Down Expand Up @@ -253,6 +256,7 @@ jobs:
cmake \
-G Ninja \
-DOPTION_TARGET_PYTHON_BINDING=OFF \
-DOPTION_TARGET_MESSAGING=OFF \
-DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
-DOPTION_TARGET_FV_SOLVER=ON \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: conda build conda.recipe

- name: Install
run: conda install -c ${CONDA_PREFIX}/conda-bld/ pyvcell_fvsolver
run: conda install -c ${CONDA_PREFIX}/conda-bld/ .

- name: Test
run: pytest tests
2 changes: 1 addition & 1 deletion .github/workflows/pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Build and install
run: pip install --verbose ./pyvcell-fvsolver
run: pip install --verbose .

- name: Test
run: pytest
8 changes: 0 additions & 8 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,16 @@ jobs:
submodules: true

- name: Build SDist
working-directory: pyvcell-fvsolver
run: pipx run build --sdist

- name: Check metadata
working-directory: pyvcell-fvsolver
run: pipx run twine check dist/*

- name: artifact upload
uses: actions/upload-artifact@v4
with:
name: cibw-sdist
path: dist/*.tar.gz
working-directory: pyvcell-fvsolver


build_wheels:
Expand All @@ -57,21 +54,17 @@ jobs:

- name: build wheel
uses: pypa/[email protected]
with:
working-directory: pyvcell-fvsolver
env:
CIBW_ARCHS_MACOS: universal2
CIBW_ARCHS_WINDOWS: auto ARM64

- name: Verify clean directory
working-directory: pyvcell-fvsolver
run: git diff --exit-code
shell: bash

- uses: actions/upload-artifact@v4
with:
name: cibw-wheels-${{ matrix.os }}
working-directory: pyvcell-fvsolver
path: wheelhouse/*.whl


Expand All @@ -91,7 +84,6 @@ jobs:

- uses: actions/download-artifact@v4
with:
working-directory: pyvcell-fvsolver
pattern: cibw-*
merge-multiple: true
path: dist
Expand Down
Loading

0 comments on commit 73a7fc0

Please sign in to comment.