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

Teach bazelisk.py about .bazeliskrc #494

Merged
merged 2 commits into from
Nov 25, 2024

Conversation

jwnimmer-tri
Copy link
Contributor

@jwnimmer-tri jwnimmer-tri commented Aug 25, 2023

This allows for suggesting (but not requiring) a bazel version using the bazeliskrc dotfile.

@jwnimmer-tri jwnimmer-tri force-pushed the python-dotfile-enhancements branch from 4ec0d7c to c5ea229 Compare August 25, 2023 01:16
@jwnimmer-tri jwnimmer-tri force-pushed the python-dotfile-enhancements branch 2 times, most recently from 0763f0b to 274c2b4 Compare August 25, 2023 23:29
jwnimmer-tri added a commit to jwnimmer-tri/drake that referenced this pull request Aug 26, 2023
This is a copy as of bazelbuild/bazelisk#494.

In a future commit, we'll add infrastructure to keep our copy in sync.

Co-authored-by: Akshay Shah <[email protected]>
Co-authored-by: Alex Ford <[email protected]>
Co-authored-by: Andrew Z Allen <[email protected]>
Co-authored-by: Clint Harrison <[email protected]>
Co-authored-by: Coeuvre <[email protected]>
Co-authored-by: Florian Weikert <[email protected]>
Co-authored-by: Jeremy Maitin-Shepard <[email protected]>
Co-authored-by: Jingwen Chen <[email protected]>
Co-authored-by: Jonathan Bluett-Duncan <[email protected]>
Co-authored-by: Marcel Hlopko <[email protected]>
Co-authored-by: Markus Padourek <[email protected]>
Co-authored-by: Matt Passell <[email protected]>
Co-authored-by: Natalie Pendragon <[email protected]>
Co-authored-by: Philipp Wollermann <[email protected]>
Co-authored-by: Philipp Wollermann <[email protected]>
Co-authored-by: Robbert van Ginkel <[email protected]>
Co-authored-by: rpwoodbu <[email protected]>
Co-authored-by: Sergey Balabanov <[email protected]>
Co-authored-by: Zhongpeng Lin <[email protected]>
jwnimmer-tri added a commit to jwnimmer-tri/drake that referenced this pull request Aug 26, 2023
This is a copy as of bazelbuild/bazelisk#494.

In a future commit, we'll add infrastructure to keep our copy in sync.

Co-authored-by: Akshay Shah <[email protected]>
Co-authored-by: Alex Ford <[email protected]>
Co-authored-by: Andrew Z Allen <[email protected]>
Co-authored-by: Clint Harrison <[email protected]>
Co-authored-by: Coeuvre <[email protected]>
Co-authored-by: Florian Weikert <[email protected]>
Co-authored-by: Jeremy Maitin-Shepard <[email protected]>
Co-authored-by: Jingwen Chen <[email protected]>
Co-authored-by: Jonathan Bluett-Duncan <[email protected]>
Co-authored-by: Marcel Hlopko <[email protected]>
Co-authored-by: Markus Padourek <[email protected]>
Co-authored-by: Matt Passell <[email protected]>
Co-authored-by: Natalie Pendragon <[email protected]>
Co-authored-by: Philipp Wollermann <[email protected]>
Co-authored-by: Philipp Wollermann <[email protected]>
Co-authored-by: Robbert van Ginkel <[email protected]>
Co-authored-by: rpwoodbu <[email protected]>
Co-authored-by: Sergey Balabanov <[email protected]>
Co-authored-by: Zhongpeng Lin <[email protected]>
jwnimmer-tri added a commit to jwnimmer-tri/drake that referenced this pull request Aug 28, 2023
This is a copy as of bazelbuild/bazelisk#494.

In a future commit, we'll add infrastructure to keep our copy in sync.
jwnimmer-tri added a commit to jwnimmer-tri/drake that referenced this pull request Aug 28, 2023
This is a copy as of bazelbuild/bazelisk#494.

In a future commit, we'll add infrastructure to keep our copy in sync.
jwnimmer-tri added a commit to jwnimmer-tri/drake that referenced this pull request Aug 29, 2023
This is a copy as of bazelbuild/bazelisk#494.

In a future commit, we'll add infrastructure to keep our copy in sync.
@jwnimmer-tri jwnimmer-tri force-pushed the python-dotfile-enhancements branch 3 times, most recently from 2e030c9 to 28f12f1 Compare November 22, 2023 03:45
@jwnimmer-tri
Copy link
Contributor Author

Hi team. Is there anything I can do to help move this forward? I just fixed the merge conflict errors with a rebase.

@jwnimmer-tri
Copy link
Contributor Author

Hi team. Is there anything I can do to help move this forward?

@jwnimmer-tri jwnimmer-tri force-pushed the python-dotfile-enhancements branch from 28f12f1 to 0621917 Compare March 22, 2024 21:19
@jwnimmer-tri
Copy link
Contributor Author

Hi team. Is there anything I can do to help move this forward? All tests are passing.

@albertocavalcante
Copy link
Contributor

@jwnimmer-tri just wondering - is this still relevant? (I didn't take a look yet)

@jwnimmer-tri jwnimmer-tri force-pushed the python-dotfile-enhancements branch from 0621917 to fd67afb Compare July 9, 2024 15:52
@jwnimmer-tri
Copy link
Contributor Author

Yes, I believe so.

I just rebased and re-tested locally and all tests passed.

@meteorcloudy meteorcloudy requested a review from fweikert July 17, 2024 15:21
bazelisk.py Outdated Show resolved Hide resolved
@meteorcloudy meteorcloudy added the awaiting-user-response Awaiting a response from the author label Aug 27, 2024
@jwnimmer-tri jwnimmer-tri force-pushed the python-dotfile-enhancements branch from 847bbc5 to 8dbaff5 Compare September 7, 2024 17:26
@jwnimmer-tri jwnimmer-tri force-pushed the python-dotfile-enhancements branch from 8dbaff5 to 09ed135 Compare September 7, 2024 17:27
@jwnimmer-tri
Copy link
Contributor Author

This should be ready for re-review now.

@jwnimmer-tri
Copy link
Contributor Author

The label "awaiting-user-response" is no longer accurate -- I have responded.

@fweikert fweikert removed the awaiting-user-response Awaiting a response from the author label Nov 25, 2024
@fweikert fweikert merged commit c3aa711 into bazelbuild:master Nov 25, 2024
2 checks passed
@fweikert
Copy link
Member

Thank you!

@jwnimmer-tri jwnimmer-tri deleted the python-dotfile-enhancements branch November 25, 2024 17:26
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.

4 participants