-
-
Notifications
You must be signed in to change notification settings - Fork 369
array tests: handle different hexdigests from zlib-ng (#1678) #1972
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
array tests: handle different hexdigests from zlib-ng (#1678) #1972
Conversation
d883b61 to
b428945
Compare
b428945 to
375bb63
Compare
|
If I run |
|
Thanks for the fix. For posterity, the ideal way to handle two different versions of zlib would be to condition the test case on the detected zlib version, but our test design makes that very tedious and not worth the effort. I think what you have done here is good! |
|
we are seeing test failures due to numpy 2.0 I think |
|
yeah, it looks like numpy got some custom types. I guess you might need to do stuff like: or something along those lines. |
|
I guess the NumPy stuff was fixed by #2073, so this might just need a rebase. |
375bb63 to
d6aed0d
Compare
|
Rebased. |
|
Thanks for the PR - is there any way we can install zlib-ng and test against it in our continuous integration? I'm wary about adding these new digests without actually testing them to make sure they're correct. |
|
Possibly by using this PPA. I can play around with it if I get time. AFAIK github doesn't offer anything besides Ubuntu and Windows as hosted runners, so if you want to run on any other OS you have to self-host the runners, which is a whole thing. |
|
It looks like there's a package on PyPI: https://pypi.org/project/zlib-ng/, so perhaps we could install that on Ubuntu and test the new digests using that? |
|
It's a bit confusing, but I think that's only python bindings. If you look at their CI, they install miniconda and then https://anaconda.org/conda-forge/zlib-ng to get zlib-ng itself before installing their own thing - https://github.com/pycompression/python-zlib-ng/blob/develop/.github/workflows/ci.yml#L120 . Presumably you'd also have to do that here. I kinda feel like using a PPA that replaces the system zlib seems more straightforward than doing that, but I haven't tried either way yet, tbf... |
e799e24 to
af7d892
Compare
|
huh, so it looks like we already have miniconda in our CI anyway so it should be fairly trivial to add a matrix dimension that tests with zlib-ng from miniconda - that's what I tried to do here - but GHA doesn't seem to be generating that matrix combination. not sure if it needs admin approval or something? |
af7d892 to
caec68f
Compare
|
this is a slightly different way which should avoid a bit of a combinatorial explosion effect, but GHA still doesn't seem to pick up the change :/ |
|
I've moved the base branch of this PR to |
|
well, I don't know why GHA isn't picking up the test matrix change, and I'm not an admin so I can't really poke about much and find out. I'm a bit stuck there. |
|
I don't see any links to any workflow runs on the commit related to the changed file, so that suggests that perhaps there is a syntax error? |
caec68f to
21a0333
Compare
|
hum, well, I did see one thing (I had condadeps as an array in one case but a string in the other, it should be a string in both I think). not sure if that was the issue, though. edited and rebased. |
|
This repo also has the stricter workflow approval setting enabled, so it's quite possible that that is interfering. You may be able to confirm by pushing to |
|
Hmm, I'm not even getting the option to approve the workflow runs. Let me close and re-open this PR to see if that helps. |
|
Ah, this is because we are in branch naming flux, and #2349 needs to get in before we can run actions on the v2 branch. Sorry about this, when it's working again I'll run the tests, and if they pass give this a merge. Thanks for the contribution and patience with us on this! |
|
CI should be up and running again now. |
|
aaaagh merge commits, evil! i'll rebase. |
|
the merge-commit version actually seems wrong as it's badly merged (it'll cause python 3.13 with numpy 1.24 to be included, not excluded). |
33fad90 to
f586ec3
Compare
|
Sorry 🙈 |
|
Ugh. https://github.com/zarr-developers/zarr-python/actions/runs/11411354019 . What the heck? Why can't I use an empty string? I was trying to avoid duplicating 'pip nodejs' in the two places we define the conda deps string, but if we can't use an empty string in one place I don't see how :( |
f586ec3 to
233c5b0
Compare
|
It was right with the array, I think; as the matrix expands everything as the product of every list item. At least, all their examples use arrays, though none of them contain only a single item. |
233c5b0 to
71d01ae
Compare
|
ok then, let's try them both as arrays... |
…s#1678) As explained in the issue, zlib-ng produces different hex digests from original zlib. This adjusts the tests slightly to allow for this. Signed-off-by: Adam Williamson <[email protected]>
71d01ae to
c544a50
Compare
|
ugh. no. I'm pretty sure it was right the first time: first def is an array, second is a string. back to that. |
dstansby
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks again for this, and sorry it's taken so long - I will merge if CI passes.
As explained in the issue, zlib-ng produces different hex digests from original zlib. This adjusts the tests slightly to allow for this.
TODO:
Removed TODO items are irrelevant as this only changes tests. This is more or less the same as #1971 , but for the main (v2) branch rather than v3 branch.