Conversation
As discussed in the JuliaAstro meeting, we'd like to move what is
currently known as ASDF2.jl into the ASDF.jl repository. There's a few
ways that we could do this, but we opted for a method that would
preserve the history of both.
This could likely be achived using `git-replace`, but instead the
repository has been cleared and the "graft" performed by playing back
all commits from ASDF2.jl into ASDF.jl. This means all commits appear to
have been committed at times different from their author dates, but this
seemed better than using `--committer-date-is-author-date`, as GitHub
appears to get very confused when the commit dates are out of order. It
is arguable a more accurate reflection of what we are doing here.
It's also more in line with e.g.
https://lore.kernel.org/all/CAHk-=wgcQdD0UzMJrNhQuYAC2wgGtfrCry_iokswaEE5j7W9YA@mail.gmail.com/
and hence why the commit author is me instead of the original authors.
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
This commit updates the UUID of the package to match the original identifier, and sets the version to the next major version representing the big breaking change. It also replaces all instances of the UUIDs, and applies a s/ASDF2/ASDF/ substitution to the whole project.
Welcome to Codecov 🎉Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests. Thanks for integrating Codecov - We've got you covered ☂️ |
|
Thanks for this thoughtful git surgery, Fergus! I've just finished going through all of the changes and approved things on my end. Will await @eschnett for the final sign-off.
For sure, happy to update CI things after this is merged. I'll start getting an update ready on the JuliaAstro website side of things as well. I guess it would also be good to mention this new release in the original announcement post on discourse https://discourse.julialang.org/t/new-package-asdf-jl/15808 |
|
You are not actually changing the UUID, are you? The diff doesn't show it as changing, and it must stay the same. |
|
The failing CI needs to be corrected, but that can happen after the switch-over. (It should happen before the new version is registered.) Do you want to merge this? (Do you have permission to do so?) |
I believe we are on the same wavelength here. I think Fergus just means that they changed the UUID transplanted from ASDF2 back to the one for ASDF, that's all.
Agreed. We are doing things in pieces. 1) transfer the code base (this PR), 2) fix up any remaining items. I would be happy to handle the CI as I mentioned here. I'll take this as your confirmation that things are good to go now, thanks Erik! We'll take it from here |
4 participants
As discussed in the JuliaAstro meetings (also #13) we'd like to move what is currently known as ASDF2.jl into the ASDF.jl repository. There's a few ways that we could do this, but we opted for a method that would preserve the history of both, so that old Julia package versions and
git-blamewould still work.This could likely be achieved using
git-replace, but instead the repository has been cleared and the "graft" performed by playing back all commits from ASDF2.jl into ASDF.jl. This means all commits appear to have been committed at times different from their author dates, but this seemed better than using--committer-date-is-author-date, as GitHub appears to get very confused when the commit dates are out of order. It is arguable a more accurate reflection of what we are doing here.For the purposes of telling versions apart, it's also possible to use the cleanup commit as the base of the new tree.
It's also more in line with e.g. opinions, and hence why the commit author is me instead of the original authors.
Versioning
So that we can register this as a new version of ASDF.jl, I've added a new commit to the end that updates the package UUID, the name, and bump the package version to be the next major version (major breaking change). The CI seems happy except for a deprecated Macos version, which I may leave to someone else to update.
This means we can probably archive as read-only the ASDF2.jl repository?