Skip to content

Switch master branches to main #44

New issue
New issue
Closed
zarr-developers/zarr-python
#1033
Closed
Switch master branches to main#44
zarr-developers/zarr-python
#1033

Description

@jakirkham
jakirkham
opened on Feb 25, 2022

Would like to suggest that we change our default branches to main and drop master. This is inline with what GitHub itself is doing. Other projects are already undergoing this transition. Think this will be relatively simple for Zarr to do (though we may want to check if master is hard-coded anywhere). Thoughts? 🙂

Activity

  1. joshmoore commented on Feb 25, 2022

    @joshmoore
    joshmoore
    on Feb 25, 2022
    Member

    It's definitely hard-coded in a few places (workflows, readthedocs configuration, etc.) but in doing it elsewhere, I've never run into a true blocker. 👍

  2. jakirkham commented on Feb 25, 2022

    @jakirkham
    jakirkham
    on Feb 25, 2022
    MemberAuthor

    conda-forge is the hardest case I've seen (lots of reasons for that). Though that just means things move more slowly. I don't think we have the same kind of issues as there though.

  3. joshmoore commented on Feb 25, 2022

    @joshmoore
    joshmoore
    on Feb 25, 2022
    Member

    Added a checklist with the completed repos marked off.

  4. joshmoore commented on Feb 26, 2022

    @joshmoore
    joshmoore
    on Feb 26, 2022
    Member

    An example of links that are a bit trickier:

    zarr-governance $ git grep master
CODE_OF_CONDUCT.md:https://github.com/zarr-developers/.github/blob/master/CODE_OF_CONDUCT.md
CORE_DEV_GUIDE.md:with the [general contributor guide](https://github.com/zarr-developers/.github/blob/master/CONTRIBUTING.md).
CORE_DEV_GUIDE.md:[Code of Conduct](https://github.com/zarr-developers/.github/blob/master/CODE_OF_CONDUCT.md).
CORE_DEV_GUIDE.md:-  Our [contributor guide](https://github.com/zarr-developers/.github/blob/master/CONTRIBUTING.md).
CORE_DEV_GUIDE.md:-  Our [code of conduct](https://github.com/zarr-developers/.github/blob/master/CODE_OF_CONDUCT.md).
GOVERNANCE.md:as well as the [Code of Conduct](https://github.com/zarr-developers/.github/blob/master/CODE_OF_CONDUCT.md).

    but supposedly GitHub redirects. Testing now on the .github repository.

    Edit: indeed! 👍

  5. jakirkham commented on Feb 26, 2022

    @jakirkham
    jakirkham
    on Feb 26, 2022
    MemberAuthor

    Relative links can also point to the same locations, but avoid direct branch references

  6. joshmoore commented on Feb 26, 2022

    @joshmoore
    joshmoore
    on Feb 26, 2022
    Member

    Relative links can also point to the same locations, but avoid direct branch references

    Between repositories?

  7. jakirkham commented on Feb 26, 2022

    @jakirkham
    jakirkham
    on Feb 26, 2022
    MemberAuthor

    That's fair. Probably not

  8. joshmoore commented on Feb 26, 2022

    @joshmoore
    joshmoore
    on Feb 26, 2022
    Member

    Ah, there is! HEAD:

    https://github.com/zarr-developers/.github/blob/HEAD/CODE_OF_CONDUCT.md

  9. jakirkham commented on Feb 26, 2022

    @jakirkham
    jakirkham
    on Feb 26, 2022
    MemberAuthor

    TIL 😀

  10. joshmoore commented on May 20, 2022

    @joshmoore
    joshmoore
    on May 20, 2022
    Member

    Changed zarr-specs to use "main" after merging the 3.0-dev branch.

  11. jakirkham commented on May 20, 2022

    @jakirkham
    jakirkham
    on May 20, 2022
    MemberAuthor

    Have switched a bunch of repos over. Think it would be good if someone looked at how to do this for the webpage repo. Going to add PRs to numcodecs and zarr-python

  12. jakirkham commented on May 20, 2022

    @jakirkham
    jakirkham
    on May 20, 2022
    MemberAuthor

    Also it is worth noting that when using the rename branch feature on GitHub it automatically handles redirection for us. So links pointing to master will redirect to main. Not that we shouldn't go back and update them, but we should feel more comfortable making the change

  13. jakirkham commented on May 20, 2022

    @jakirkham
    jakirkham
    on May 20, 2022
    MemberAuthor

    Opened PRs for everything but the webpage repo

  14. jakirkham commented on May 20, 2022

    @jakirkham
    jakirkham
    on May 20, 2022
    MemberAuthor

    So did a test run of updating GitHub pages by using zarr_implementations as a guinea pig. This should help with the webpage repo.

    The key takeaway is once we have a PR up to fix the webpage repo, we should rename the branch to main before merging it. That way GitHub pages will redeploy on merge using main.

    Did the opposite order with zarr_implementations and had to create a trivial PR ( zarr-developers/zarr_implementations#56 ) to merge and redeploy. This shouldn't be needed if we rename the branch to main before merging the PR there.

  15. jakirkham commented on May 20, 2022

    @jakirkham
    jakirkham
    on May 20, 2022
    MemberAuthor

    Didn't see any master references in the webpage repo (outside of external links that haven't been fixed). So just went with a trivial change in PR ( zarr-developers/zarr-developers.github.io#50 ). Handled the branch renaming beforehand and merged. Seems to have redeployed the page and is working. Though please let me know if you spot any issue and can take another look

  16. jakirkham commented on May 20, 2022

    @jakirkham
    jakirkham
    on May 20, 2022
    MemberAuthor

    Last change needed is PR ( zarr-developers/zarr-python#1033 ) and then this is done! 🎉

  17. jakirkham
    closed this as completedin zarr-python#1033on May 23, 2022

  18. sanketverma1704 commented on May 23, 2022

    @sanketverma1704
    sanketverma1704
    on May 23, 2022
    Member

    Thanks for taking care of this @jakirkham. 🙌🏻

  19. jakirkham commented on May 23, 2022

    @jakirkham
    jakirkham
    on May 23, 2022
    MemberAuthor

    Thanks Josh for getting the ball rolling 😄

    It's always possible there are lingering issues. Feel free to raise issues on the respective repos and xref this issue

  20. joshmoore commented on May 23, 2022

    @joshmoore
    joshmoore
    on May 23, 2022
    Member

    🕺🏽

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions