Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2964 +/- ##
=======================================
Coverage 89.62% 89.62%
=======================================
Files 29 29
Lines 30170 30170
Branches 5867 5867
=======================================
Hits 27041 27041
Misses 1790 1790
Partials 1339 1339
Flags with carried forward coverage won't be shown. Click here to find out more.
|
benjeffery
left a comment
benjeffery
left a comment
There was a problem hiding this comment.
Looks good, to test wheel building, push to origin/test
.github/workflows/tests.yml
Outdated
| fail-fast: false | ||
| matrix: | ||
| python: [ 3.8, 3.9, "3.11" ] | ||
| python: [ 3.9, 3.11, 3.12 ] |
There was a problem hiding this comment.
If test versions are changing then mergify rules need updating.
|
Looks like this is mostly working now. Outstanding issues:
|
|
Shall I pick this up or is it simpler to start again @benjeffery? The kastore conda-forge packages should be built and available in the next few hours, so that should unblock us here. |
jeromekelleher
force-pushed
the
compile-numpy2
branch
from
92db457 to
4c967f4
Compare
I'm working on this now! |
jeromekelleher
left a comment
jeromekelleher
left a comment
There was a problem hiding this comment.
Actual code changes look small, great!
python/setup.py
Outdated
|
|
||
| # Obscure magic required to allow numpy be used as a 'setup_requires'. | ||
| # Based on https://stackoverflow.com/questions/19919905 | ||
| class local_build_ext(build_ext): |
There was a problem hiding this comment.
Do we need this at all any more?
There was a problem hiding this comment.
Hmm, removing this worked locally, but not on CI.
There was a problem hiding this comment.
Kastore works without it, check how we do it there
python/tests/test_ld_matrix.py
Outdated
| w_aB = state[2, k] | ||
| w_ab = n - (w_AB + w_Ab + w_aB) | ||
| with suppress_division_by_zero_warning(): | ||
| with np.errstate(over="ignore", divide="ignore", invalid="ignore"): |
There was a problem hiding this comment.
Wouldn't it be better to update the original function here rather than duplicating?
|
All seems to be working - I'll squash and merge. |
benjeffery
force-pushed
the
compile-numpy2
branch
2 times, most recently
from
ffead55 to
b1cd1bb
Compare
|
Realised we were doing wheels for 3.12, but not testing on it. Fixing that now |
benjeffery
force-pushed
the
compile-numpy2
branch
from
b1cd1bb to
78753d7
Compare
…dd pyproject.toml
benjeffery
force-pushed
the
compile-numpy2
branch
from
78753d7 to
bb137ff
Compare
jeromekelleher
left a comment
jeromekelleher
left a comment
There was a problem hiding this comment.
LGTM! What's the strategy for pushing an updated release - cherry pick this back onto last release tag?
Seems the simplest approach. |
2 participants
Part of supporting numpy >= 2. Following the ABI advice from numpy, we should be able to compile against numpy version >= 2, and also have a runtime dependency < 2. Hopefully this is all we need to do initially to ship compatible wheels and conda packages (which are also broken)