Skip to content

Commit

Permalink
Merge pull request #1260 from glotzerlab/pybind11-fix-ci
Browse files Browse the repository at this point in the history
Fix broken CI jobs on pybind11 branch.
  • Loading branch information
tommy-waltmann authored Jun 25, 2024
2 parents 8c96377 + 4b44cf4 commit 6f69a07
Show file tree
Hide file tree
Showing 23 changed files with 6,645 additions and 3,796 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ jobs:
CIBW_ARCHS: auto64

# Configure environment variables.
CIBW_ENVIRONMENT_LINUX: "CMAKE_PREFIX_PATH=/project/tbb LD_LIBRARY_PATH=/project/tbb/lib/intel64/gcc4.8:$LD_LIBRARY_PATH"
CIBW_ENVIRONMENT_MACOS: "CMAKE_PREFIX_PATH=/Users/runner/work/freud/freud/tbb:/Users/runner/work/tbb-install LD_LIBRARY_PATH=/Users/runner/work/freud/freud/tbb/lib/intel64/gcc4.8:$LD_LIBRARY_PATH"
CIBW_ENVIRONMENT_LINUX: "CMAKE_PREFIX_PATH=/project/tbb LD_LIBRARY_PATH=/project/tbb/lib/intel64/gcc4.8:$LD_LIBRARY_PATH CMAKE_ARGS=-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=True"
CIBW_ENVIRONMENT_MACOS: "CMAKE_PREFIX_PATH=/Users/runner/work/freud/freud/tbb:/Users/runner/work/tbb-install CMAKE_ARGS=-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=True"
MACOSX_DEPLOYMENT_TARGET: "10.14"

# Set up TBB.
Expand All @@ -113,7 +113,9 @@ jobs:
scipy==${{ matrix.python.oldest_scipy }}
gsd==${{ matrix.python.oldest_gsd }}
matplotlib==${{ matrix.python.oldest_matplotlib }}
CIBW_TEST_COMMAND: "cd {package}/tests && pytest . -v --log-level=DEBUG"
# Test only the currently ported modules
CIBW_TEST_COMMAND: "cd {package}/tests && pytest test_box_Box.py test_parallel.py -v --log-level=DEBUG"
# CIBW_TEST_COMMAND: "cd {package}/tests && pytest . -v --log-level=DEBUG"

- uses: actions/[email protected]
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/env-files/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ channels:

dependencies:
- python==3.12
# TODO: Update to a newer cppcheck and adjust all C++ code to meet the new style guidlines
- cppcheck<2.0.0 # [linux64]
- tbb
- tbb-devel
- ninja
Expand All @@ -12,8 +14,10 @@ dependencies:
- dynasor
- gsd
- matplotlib
- nanobind>=2.0
- numpy
- pillow
- pre-commit
- pytest
- rowan
- scikit-build
Expand Down
Loading

0 comments on commit 6f69a07

Please sign in to comment.