Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add limitation to cython version for MOAB compatibility & more selectivity about when some tests are run #893

Merged
merged 4 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/linux_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ on:
- develop
paths-ignore:
- '.github/workflows/docker_publish.yml'
- '.github/workflows/mac_build_test.yml'
- '.github/workflows/windows_build_test.yml'
- '.github/workflows/housekeeping.yml'
- 'CI/**'
push:
branches:
- develop
paths-ignore:
- '.github/workflows/docker_publish.yml'
- '.github/workflows/mac_build_test.yml'
- '.github/workflows/windows_build_test.yml'
- '.github/workflows/housekeeping.yml'
- 'CI/**'

Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/mac_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,21 @@ on:
pull_request:
branches:
- develop
paths-ignore:
- '.github/workflows/docker_publish.yml'
- '.github/workflows/linux_build_test.yml'
- '.github/workflows/windows_build_test.yml'
- '.github/workflows/housekeeping.yml'
- 'CI/**'
push:
branches:
- develop
paths-ignore:
- '.github/workflows/docker_publish.yml'
- '.github/workflows/linux_build_test.yml'
- '.github/workflows/windows_build_test.yml'
- '.github/workflows/housekeeping.yml'
- 'CI/**'

release:
types: # This configuration does not affect the page_build event above
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/windows_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,21 @@ on:
pull_request:
branches:
- develop
paths-ignore:
- '.github/workflows/docker_publish.yml'
- '.github/workflows/mac_build_test.yml'
- '.github/workflows/linux_build_test.yml'
- '.github/workflows/housekeeping.yml'
- 'CI/**'
push:
branches:
- develop
paths-ignore:
- '.github/workflows/docker_publish.yml'
- '.github/workflows/mac_build_test.yml'
- '.github/workflows/linux_build_test.yml'
- '.github/workflows/housekeeping.yml'
- 'CI/**'

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion CI/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN apt-get -y update; \
apt-get install -y git; \
update-alternatives --install /usr/bin/python python /usr/bin/python3 10; \
update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10; \
pip install cython;
pip install "cython<3";

ARG build_dir
ARG install_dir
Expand Down
1 change: 1 addition & 0 deletions doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Next version
* Patched cmake-search paths for double-down and MOAB (#878)
* Patch to compile with gcc-13 (#882)
* Tweak conda environment for Windows build to avoid conflicting gtest headers (#888)
* Restrict cython version for MOAB (#893)

v3.2.2
====================
Expand Down