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

Jump to bottom

docs: migrate to main branch #76

Merged
merged 8 commits into from Aug 23, 2021
Merged

docs: migrate to main branch #76

merged 8 commits into from Aug 23, 2021

Conversation

dandhlee
Copy link
Contributor

@dandhlee dandhlee commented Aug 23, 2021 •
edited

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:

  • Make sure to open an issue as a bug/issue before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
  • Ensure the tests and linter pass
  • Code coverage does not decrease (if any source code was changed)
  • Appropriate docs were updated (if necessary)

Fixes #75 🦕

@dandhlee dandhlee requested a review from parthea August 23, 2021 19:03
@product-auto-label product-auto-label bot added the api: accesscontextmanager Issues related to the googleapis/python-access-context-manager API. label Aug 23, 2021
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Aug 23, 2021
@dandhlee dandhlee added the owlbot:run Add this label to trigger the Owlbot post processor. label Aug 23, 2021
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Aug 23, 2021
@dandhlee dandhlee added the owlbot:run Add this label to trigger the Owlbot post processor. label Aug 23, 2021
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Aug 23, 2021
@dandhlee dandhlee added owlbot:run Add this label to trigger the Owlbot post processor. and removed owlbot:run Add this label to trigger the Owlbot post processor. labels Aug 23, 2021
@dandhlee dandhlee marked this pull request as ready for review August 23, 2021 19:12
@dandhlee dandhlee requested a review from a team as a code owner August 23, 2021 19:12
jimfulton
jimfulton reviewed Aug 23, 2021
View reviewed changes
owlbot.py Outdated
Comment on lines 187 to 203
s.replace(
"CONTRIBUTING.rst",
"master",
"main"
)

s.replace(
"docs/conf.py",
"master",
"main"
)

s.replace(
".kokoro/*",
"master",
"main"
)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you have to use owlbot for this because we can't update the templates yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I believe the plan is to update on the branches first, and then we'll update the templates. Once that's done we'll revert the changes on OwlBot.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another suggestion is to have a flag that switches main/master in the templates so it's a one line change. Post-migration you can just make main the default.

I did something similar back when we were moving to the microgenerator.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sounds good @busunkim96, do you have any links for the previous PRs with those examples? Can't visualize how that'd work here :/

parthea
parthea reviewed Aug 23, 2021
View reviewed changes
Copy link
Contributor

@parthea parthea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added 2 minor observations

docs/conf.py Outdated Show resolved Hide resolved
CONTRIBUTING.rst Outdated Show resolved Hide resolved
@dandhlee dandhlee requested a review from parthea August 23, 2021 20:14
@dandhlee
Copy link
Contributor Author

Please take a look again!

@dandhlee dandhlee merged commit 4f36a1d into main Aug 23, 2021
@dandhlee dandhlee deleted the to_main branch August 23, 2021 21:55
gcf-merge-on-green bot pushed a commit that referenced this pull request Aug 23, 2021
@release-please
chore: release 0.1.7 (#77)
22b7ecf 
🤖 I have created a release \*beep\* \*boop\*
---
### [0.1.7](https://www.github.com/googleapis/python-access-context-manager/compare/v0.1.6...v0.1.7) (2021-08-23)


### Documentation

* migrate to main branch ([#76](https://www.github.com/googleapis/python-access-context-manager/issues/76)) ([4f36a1d](https://www.github.com/googleapis/python-access-context-manager/commit/4f36a1dad07554ef676c7b01a9f1bd0e132bdb01))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
@tseaver
Copy link
Contributor

tseaver commented Aug 24, 2021

For future PRs, this should not be labeled docs:, but rather chore: -- no user-relevant change is occuring.

@parthea
Copy link
Contributor

parthea commented Aug 24, 2021

@dandhlee @nicain Please use chore: moving forward for the commit message/PR title.

@parthea parthea mentioned this pull request Aug 27, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@busunkim96 busunkim96 busunkim96 left review comments

@parthea parthea parthea approved these changes

@jimfulton jimfulton Awaiting requested review from jimfulton

Assignees
No one assigned
Labels
api: accesscontextmanager Issues related to the googleapis/python-access-context-manager API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Migrate to main branch
5 participants
@dandhlee @tseaver @parthea @jimfulton @busunkim96