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

[Merged by Bors] - chore: adaptations for leanprover/lean4#2973 #9161

Closed
wants to merge 10 commits into from

Conversation

semorrison
Copy link
Contributor

@semorrison semorrison commented Dec 20, 2023

This is a PR to Mathlib's bump/v4.5.0 branch, containing adaptations required for leanprover/lean4#2973, which landed in leanprover/lean4:nightly-2023-12-19 and will become part of v4.5.0-rc1 soon.


This PR was made by cherry-picking the relevant commits from @kmill's lean-pr-testing-2973 branch. (A bit of trial and error to find them all, actually.)

Done: This PR is not quite ready to merge: it is waiting on leanprover-community/batteries#470, after which we need to set the Std dependency back to bump/v4.5.0.

Done: Moreover, I think it won't build until #9162 is merged into bump/v4.5.0 and this PR...

@semorrison semorrison added awaiting-review The author would like community review of the PR awaiting-CI labels Dec 20, 2023
@jcommelin
Copy link
Member

bors d+

@mathlib-bors
Copy link

mathlib-bors bot commented Dec 21, 2023

✌️ semorrison can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@github-actions github-actions bot added delegated and removed awaiting-review The author would like community review of the PR labels Dec 21, 2023
@semorrison
Copy link
Contributor Author

bors merge

@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Dec 21, 2023
mathlib-bors bot pushed a commit that referenced this pull request Dec 21, 2023
This is a PR to Mathlib's `bump/v4.5.0` branch, containing adaptations required for leanprover/lean4#2973, which landed in `leanprover/lean4:nightly-2023-12-19` and will become part of `v4.5.0-rc1` soon.



Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
@mathlib-bors
Copy link

mathlib-bors bot commented Dec 21, 2023

Pull request successfully merged into bump/v4.5.0.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title chore: adaptations for leanprover/lean4#2973 [Merged by Bors] - chore: adaptations for leanprover/lean4#2973 Dec 21, 2023
@mathlib-bors mathlib-bors bot closed this Dec 21, 2023
@mathlib-bors mathlib-bors bot deleted the adaptation_2973 branch December 21, 2023 06:08
mathlib-bors bot pushed a commit that referenced this pull request Dec 22, 2023
…h. (#9188)

This PR:
* bumps to lean-toolchain to `v4.5.0-rc1`
* bumps the Std and Aesop dependencies to their versions using `v4.5.0-rc1`
* merge the already reviewed changes from the `bump/v4.5.0` branch
  * adaptations for leanprover/lean4#2923 in #9011
  * adaptations for leanprover/lean4#2973 in #9161
  * adaptations for leanprover/lean4#2964 in #9176

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
delegated ready-to-merge This PR has been sent to bors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants