Skip to content

Conversation

@aldanor
Copy link
Owner

@aldanor aldanor commented Jun 9, 2023

Ok, this should allow to rebase the pending PRs and move forward with them, so we get green builds:

  • Bump all dependencies at once (something may get broken, we'll see)
  • Bump edition to 2021
  • Bump MSRV to 1.64 (to use workspace inheritance)
  • Use workspace inheritance for most crate metadata
  • Use workspace inheritance for external/internal deps where possible
  • Fix all accumulated clippy errors
  • Migrate hdf5-derive to syn 2.0, migrate to the latest bitflags

Closes #238

@aldanor aldanor requested a review from mulimoen June 9, 2023 09:55
@aldanor
Copy link
Owner Author

aldanor commented Jun 9, 2023

@mulimoen Might need some help digging through some CI errors 🤦

  • clippy fail - where does the bitflags version conflict even come from? Just a random thought, could it be build-cache-related?
  • brew hdf5@1.12 - apparently version 1.12 have been removed from homebrew altogether (why?..) So we should probably remove it too from CI. However hdf5@1.14 has been added which we should add back when we merge in 1.14 support.
  • brew hdf5-mpi - uses the latest hdf5 which is now 1.14, so we should probably temporarily comment it out until 1.14 support is merged in.
  • wine - I'm not sure what's the problem here?

@aldanor
Copy link
Owner Author

aldanor commented Jun 9, 2023

@mulimoen I've noticed you mentioned in the other PR that ubuntu version should be bumped to ubuntu 20.04, wonder why? (should it be bumped in this PR as well then perhaps)

@mulimoen
Copy link
Collaborator

mulimoen commented Jun 9, 2023

Ubuntu 18.04 is EOL and has been disabled

@mulimoen
Copy link
Collaborator

mulimoen commented Jun 9, 2023

Bitflags is dragged in by both us and tempfile, which wants an older version. This is just a lint and can be disabled by -A clippy:multiple-crate-versions (I think)

@aldanor
Copy link
Owner Author

aldanor commented Jun 9, 2023

Bitflags is dragged in by both us and tempfile, which wants an older version. This is just a lint and can be disabled by -A clippy:multiple-crate-versions (I think)

Oh, indeed. It's actually dragged by rustix which now has an open PR that migrates it to bitflags 2.

@aldanor aldanor force-pushed the feature/fixups-2023 branch from 5818c3d to b85e16e Compare June 9, 2023 10:39
@aldanor
Copy link
Owner Author

aldanor commented Jun 9, 2023

Ok, so for now I think there's only one left - where on wine build it can't find the hdf5 library.

@mulimoen
Copy link
Collaborator

mulimoen commented Jun 9, 2023

I'd say we remove the wine check and open an issue on this. I can try to decipher the bug during the weekend

@aldanor
Copy link
Owner Author

aldanor commented Jun 9, 2023

I'd say we remove the wine check and open an issue on this. I can try to decipher the bug during the weekend

Sounds good. It seems to do the static build but then it can't find it, pretty weird. I've commented it out for now and added a todo pointing at #241.

@aldanor
Copy link
Owner Author

aldanor commented Jun 9, 2023

And now, out of a sudden, msi @ 1.12 fails...

@mulimoen
Copy link
Collaborator

mulimoen commented Jun 9, 2023

Not that fun when the error goes away on a rerun.. We'll keep an eye on this.

Could all workspace related items ([workspace], [workspace.package], [workspace.dependencies]) be moved to the top of the toplevel Cargo.toml?

@aldanor
Copy link
Owner Author

aldanor commented Jun 9, 2023

Not that fun when the error goes away on a rerun.. We'll keep an eye on this.

Agreed, not fun at all :/

Could all workspace related items ([workspace], [workspace.package], [workspace.dependencies]) be moved to the top of the toplevel Cargo.toml?

I wonder if we should just have a workspace-only Cargo.toml at the top?

And then hdf5 crate just becomes a normal package and gets moved to hdf5/ subfolder.

@mulimoen
Copy link
Collaborator

mulimoen commented Jun 9, 2023

I wonder if we should just have a workspace-only Cargo.toml at the top?

And then hdf5 crate just becomes a normal package and gets moved to hdf5/ subfolder.

That would be very clean and nice

@aldanor
Copy link
Owner Author

aldanor commented Jun 9, 2023

Ok, I've separated out the workspace and moved the main crate to hdf5/ (also added you to crate authors if you don't mind), let's hope this doesn't break everything - if it builds green I'll merge it and we can then proceed with other PRs. (rebases may be a bit painful due to moving all these files around though...)

@aldanor aldanor force-pushed the feature/fixups-2023 branch from eb17987 to 22ec7b5 Compare June 9, 2023 12:40
@aldanor aldanor merged commit b229be7 into master Jun 9, 2023
@aldanor aldanor deleted the feature/fixups-2023 branch June 9, 2023 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants