Skip to content

[Merged by Bors] - feat: port Logic.Relation#565

Closed
kbuzzard wants to merge 40 commits intomasterfrom
kbuzzard-port-logic-relation
Closed

[Merged by Bors] - feat: port Logic.Relation#565
kbuzzard wants to merge 40 commits intomasterfrom
kbuzzard-port-logic-relation

Conversation

@kbuzzard
Copy link
Copy Markdown
Member

@kbuzzard kbuzzard commented Nov 10, 2022

mathlib3 sha: 5ca6e9d2bb25feeebdefe9bd9de163897bdecd05

Relatively straightforward.

Depends on #559 (EqvGen) and #561 (mk-iffs attribute)

@kbuzzard
Copy link
Copy Markdown
Member Author

Remark: Lean 3 apply ih sometimes didn't work here, I had to give the motive explicitly. See lines 268 and 358 (or search for refine @)

@kim-em kim-em added the awaiting-author A reviewer has asked the author a question or requested changes. label Nov 10, 2022
@kim-em
Copy link
Copy Markdown
Contributor

kim-em commented Nov 11, 2022

It looks like you did many of the renames without simultaneously writing the #aligns? You do you, but I'm confused how you're going to write the #align's later. It seems prone to error!

@kbuzzard
Copy link
Copy Markdown
Member Author

kbuzzard commented Nov 11, 2022

Yeah, I think Yakov was also talking about this at the porting meeting. What I did with the bool files was just got everything working and then diffed the file with the mathbin port and did the aligns after :-)

@digama0 digama0 added the mathlib-port This is a port of a theory file from mathlib. label Nov 13, 2022
@dwrensha dwrensha mentioned this pull request Nov 14, 2022
@kbuzzard kbuzzard added awaiting-review and removed awaiting-author A reviewer has asked the author a question or requested changes. labels Nov 16, 2022
@kbuzzard
Copy link
Copy Markdown
Member Author

kbuzzard commented Nov 16, 2022

This is now compiling and ready for review (thanks for the comments even when the PR wasn't ready!) I don't know what the tag needs-mathlib-SHA means. The last mathlib3 commit which changed logic.relation is 5ca6e9d2bb25feeebdefe9bd9de163897bdecd05 and the changes made in that commit have been ported here. I took this file from a version of mathlib3port from about two weeks ago and have updated mathlib3port since.

@kim-em
Copy link
Copy Markdown
Contributor

kim-em commented Nov 16, 2022

bors merge

bors bot pushed a commit that referenced this pull request Nov 16, 2022
mathlib3 sha: 5ca6e9d2bb25feeebdefe9bd9de163897bdecd05

Relatively straightforward.

Depends on ~~#559 (`EqvGen`)~~ and ~~#561 (`mk-iffs` attribute)~~

Co-authored-by: Vierkantor <vierkantor@vierkantor.com>
Co-authored-by: David Renshaw <dwrenshaw@gmail.com>
Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
@bors
Copy link
Copy Markdown

bors bot commented Nov 16, 2022

Pull request successfully merged into master.

Build succeeded:

@bors bors bot changed the title feat: port Logic.Relation [Merged by Bors] - feat: port Logic.Relation Nov 16, 2022
@bors bors bot closed this Nov 16, 2022
@bors bors bot deleted the kbuzzard-port-logic-relation branch November 16, 2022 23:24
@digama0
Copy link
Copy Markdown
Member

digama0 commented Nov 17, 2022

This is now compiling and ready for review (thanks for the comments even when the PR wasn't ready!) I don't know what the tag needs-mathlib-SHA means. The last mathlib3 commit which changed logic.relation is 5ca6e9d2bb25feeebdefe9bd9de163897bdecd05 and the changes made in that commit have been ported here. I took this file from a version of mathlib3port from about two weeks ago and have updated mathlib3port since.

@kbuzzard Just to directly answer this question: the mathport SHA you should provide is the latest version of mathlib for which you have incorporated changes from the file that is considered to be ported by this PR (namely logic.relation in this case). So if you started with the version from two weeks ago, then during the PR you incorporated changes to the mathlib3 file and consider it up to date with today's logic.relation, then you would use today's mathlib SHA in the PR comment. It's also okay to not update your PR with changes in the meantime and just report a SHA from two weeks ago.

The important part is that you shouldn't use mathlib from two weeks ago and report today's mathlib SHA if there were important changes in those two weeks, since then those changes will fall through the cracks when we go to do upgrades later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

mathlib-port This is a port of a theory file from mathlib.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants