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

New Manifest.toml format: Pt 2. Default to new format, warn if old format is being maintained #2580

Merged
merged 7 commits into from
Jun 7, 2021

Conversation

IanButterworth
Copy link
Member

@IanButterworth IanButterworth commented May 30, 2021

New Manifest.toml format: Pt 2. (For 1.7 only, not to be backported to 1.6.2)

  • Defaults to the new manifest format
  • Warns the user (once) if an old format manifest is being maintained

Continuation after part 1 (#2561)

Fixes #1458
Fixes #2508
Closes #2557

@KristofferC
Copy link
Member

KristofferC commented Jun 1, 2021

One problem with deleting and running resolve is that you lose all the information in the manifest. Alternatively, we could have a very simple function Pkg.upgrade_manifest() and suggest that, which would keep all the dependency versions.

@IanButterworth
Copy link
Member Author

Alternatively, we could have a very simple function Pkg.upgrade_manifest() and suggest that, which would keep all the dependency versions.

Nice. Done!

@IanButterworth IanButterworth removed the DO NOT MERGE Do not merge this PR! label Jun 7, 2021
@DilumAluthge
Copy link
Member

@StefanKarpinski @KristofferC Is this PR good to merge once CI turns green?

@KristofferC
Copy link
Member

KristofferC commented Jun 7, 2021

I made it so that the upgrade manifest function also set the version field (I think that was omitted by accident). LGTM now. We will see if the warning gets too annoying but let's just focus on getting this in right now.

@DilumAluthge DilumAluthge added the merge me Merge when tests pass label Jun 7, 2021
@DilumAluthge DilumAluthge removed the request for review from KristofferC June 7, 2021 09:07
@KristofferC KristofferC merged commit 6c98f54 into JuliaLang:master Jun 7, 2021
@IanButterworth
Copy link
Member Author

I made it so that the upgrade manifest function also set the version field (I think that was omitted by accident)

@KristofferC it was intentional. I should've added a comment. I think the version needs to represent which julia version the resolve happened in, and given the tool just updates the format I don't think it's accurate to set the version field.

@KristofferC
Copy link
Member

That is true, let's take that back then :)

@KristofferC
Copy link
Member

#2599

@IanButterworth IanButterworth deleted the ib/new_manifest_pt2 branch June 7, 2021 12:11
@DilumAluthge DilumAluthge removed the merge me Merge when tests pass label Jun 18, 2021
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.

Add metadata to manifest Additional Manifest entries
3 participants