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

JDBetteridge/python312 #3546

Merged
merged 62 commits into from
Jun 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f56d200
Fix cython files for Cython 3.0
connorjward Dec 11, 2023
f789607
update firedrake-install for numpy deps
connorjward Dec 11, 2023
91e1015
lint
connorjward Dec 11, 2023
57fde42
Silly fixes
connorjward Dec 11, 2023
714d8fd
Add ninja system dependency
connorjward Dec 11, 2023
4f69130
Since we are using the docker container
connorjward Dec 11, 2023
92b62ae
fixup
connorjward Dec 11, 2023
9a4d5bc
Install with numpy 2.0 release candidate
connorjward Apr 11, 2024
d79f247
fixup
connorjward Apr 11, 2024
ba3e868
fixup
connorjward Apr 11, 2024
9c51eef
fixup
connorjward Apr 11, 2024
a868c84
fixup
connorjward Apr 11, 2024
5da6d11
fixup
connorjward Apr 11, 2024
2390837
PYOP2 branch
connorjward Apr 11, 2024
e6b319c
fixup
connorjward Apr 11, 2024
2d66f28
fixup
connorjward Apr 12, 2024
79c656e
fixup
connorjward Apr 12, 2024
ca6efad
fixup
connorjward Apr 12, 2024
b94816f
loopy is now updated
connorjward Apr 16, 2024
ac7784d
Update branches of other dependencies
JDBetteridge May 1, 2024
0b983ca
Bump Zenodo canary Python version
JDBetteridge May 1, 2024
0a088e1
Build testing docker image
JDBetteridge May 2, 2024
4391c90
More workflow changes
JDBetteridge May 2, 2024
b095b3a
fix
JDBetteridge May 2, 2024
215bfeb
New unbuntu packages
JDBetteridge May 2, 2024
f08589c
Build against testing container
JDBetteridge May 2, 2024
eb3ffd6
Do I really need to specify root?
JDBetteridge May 2, 2024
e3ec363
Test without Thetis due to issues
JDBetteridge May 2, 2024
6c4383d
Don't become root
JDBetteridge May 8, 2024
1b1696a
Try setting user
JDBetteridge May 8, 2024
4de170c
Noodling
JDBetteridge May 8, 2024
2512d10
Noodling
JDBetteridge May 8, 2024
5e6534f
Noodling
JDBetteridge May 8, 2024
f9398e6
Noodling
JDBetteridge May 8, 2024
fc0d221
Noodling
JDBetteridge May 8, 2024
d3a9a34
Noodling
JDBetteridge May 8, 2024
ea03bf8
Noodling
JDBetteridge May 8, 2024
c0e33a8
Noodling
JDBetteridge May 8, 2024
13720f3
Noodling
JDBetteridge May 8, 2024
d17d991
Noodling
JDBetteridge May 8, 2024
71e0ae9
Noodling
JDBetteridge May 8, 2024
a51161a
Noodling
JDBetteridge May 8, 2024
ff50e25
Noodling
JDBetteridge May 8, 2024
ebd2168
Reintroduce old hack
JDBetteridge May 9, 2024
97a1f0e
Try user 1000
JDBetteridge May 9, 2024
dda9045
Remove sudo permissions hack
JDBetteridge May 9, 2024
49fd03c
Try user 100
JDBetteridge May 9, 2024
62fe66d
Try the hack again
JDBetteridge May 9, 2024
b52bf52
Revert me, check the old container
JDBetteridge May 9, 2024
903cbc0
Revert me too
JDBetteridge May 9, 2024
42e3b8a
Build another testing container
JDBetteridge May 9, 2024
0b445bf
Try again!
JDBetteridge May 10, 2024
14c4ad1
Re-enable thetis and tinyASM to test the branches
JDBetteridge May 13, 2024
8231d45
Try out the second numpy release candidate
JDBetteridge May 14, 2024
451ad20
What happens if we turn off coverage
JDBetteridge May 30, 2024
9957cfb
More C consts
JDBetteridge Jun 7, 2024
9ebdb66
All package branches merged
JDBetteridge Jun 7, 2024
a51ead9
Test
JDBetteridge Jun 18, 2024
be7ef80
Use stable torch release
JDBetteridge Jun 20, 2024
129133f
Update documentation to Python3.9-3.12
JDBetteridge Jun 20, 2024
fe93ed7
tinyasm snuck back in during rebase
JDBetteridge Jun 20, 2024
e1c9e28
Apply suggestions from code review
JDBetteridge Jun 20, 2024
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
Prev Previous commit
Next Next commit
Build against testing container
  • Loading branch information
JDBetteridge committed Jun 20, 2024
commit f08589c533a7c070aa8e73c84a24d0993fdcf540
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# Run on our self-hosted machines
runs-on: self-hosted
container:
image: firedrakeproject/firedrake-env:latest
image: firedrakeproject/firedrake-test:latest
JDBetteridge marked this conversation as resolved.
Show resolved Hide resolved
strategy:
# Don't immediately kill real if complex fails and vice versa.
fail-fast: false
Expand Down Expand Up @@ -157,11 +157,11 @@ jobs:
tag: ${{ needs.docker_tag.outputs.tag }}
status: ${{ needs.build.result }}
secrets: inherit
docker_testing:
# Strictly for testing!
uses: ./.github/workflows/docker_reuse.yml
with:
target: firedrake-test
tag: latest
dockerfile: docker/Dockerfile.env
secrets: inherit
#~ docker_testing:
#~ # Strictly for testing!
#~ uses: ./.github/workflows/docker_reuse.yml
#~ with:
#~ target: firedrake-test
#~ tag: latest
#~ dockerfile: docker/Dockerfile.env
#~ secrets: inherit
JDBetteridge marked this conversation as resolved.
Show resolved Hide resolved