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

Rename master branch to main #1068

Merged
merged 5 commits into from
Aug 6, 2021
Merged

Conversation

manics
Copy link
Member

@manics manics commented Jul 24, 2021

Following process from jupyterhub/team-compass#412

Actions to take, in order:

  • approve this PR
  • rename the master branch to main in GitHub (this should automatically update all PRs)
  • merge this PR
  • check the publish workflow publishes the expected outputs if relevant
  • If readthedocs.org is used, set main as the default branch explicitly: admin -> advanced -> default branch

$ git grep master

.github/workflows/release.yml:        uses: pypa/gh-action-pypi-publish@master

External action

docs/source/conf.py:# The master toctree document.
docs/source/conf.py:master_doc = "index"
docs/source/conf.py:        master_doc,
docs/source/conf.py:man_pages = [(master_doc, "repo2docker", "repo2docker Documentation", [author], 1)]
docs/source/conf.py:        master_doc,

Sphinx stuff

repo2docker/_version.py:        # "stabilization", as well as "HEAD" and "master".

Versioneer stuff

repo2docker/contentproviders/git.py:                if ref == "master":
repo2docker/contentproviders/git.py:                        "Failed to check out the 'master' branch. "
repo2docker/contentproviders/git.py:                        "Maybe the default branch is not named 'master' "

Explicit handling of master

repo2docker/utils.py:    https://github.com/docker/distribution/blob/master/reference/regexp.go
repo2docker/utils.py:        https://github.com/docker/distribution/blob/master/reference/regexp.go

External references

tests/conftest.py:    """Create a git repository with a git submodule in a non-master branch.
tests/conftest.py:    submodules are initialized properly when the master branch doesn't have
tests/external/reproductions.repos.yaml:  ref: origin/master
tests/external/reproductions.repos.yaml:  ref: master
tests/unit/contentproviders/test_git.py:    # indeed doesn't get any submodule, even though they are in master
tests/unit/test_clone_depth.py:    """Test a remote repository, with a refspec of 'master'"""
tests/unit/test_clone_depth.py:            ref="master",
tests/unit/test_clone_depth.py:    """Test a remote repository, with a refspec of the master commit hash"""
tests/unit/test_utils.py:            "--editable=git+https://github.com/popgensims/stdpopsim.git#egg=stdpopsim-master",

I've avoided changing anything under tests since it'll require code review to ensure we don't inadvertently remove a test case.

versioneer.py:(https://travis-ci.org/warner/python-versioneer.png?branch=master)
versioneer.py:  "master" and "slave" subprojects, each with their own `setup.py`,
versioneer.py:        # "stabilization", as well as "HEAD" and "master".
versioneer.py:        # "stabilization", as well as "HEAD" and "master".

Versioneer stuff

Copy link
Member

@consideRatio consideRatio left a comment

Choose a reason for hiding this comment

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

Two suggestions, but otherwise this LGTM!

.github/workflows/release.yml:        uses: pypa/gh-action-pypi-publish@master

This can be @HEAD as well right?

docs/source/conf.py:# The master toctree document.
docs/source/conf.py:master_doc = "index"
docs/source/conf.py:        master_doc,
docs/source/conf.py:man_pages = [(master_doc, "repo2docker", "repo2docker Documentation", [author], 1)]
docs/source/conf.py:        master_doc,

root_doc is now an option to master_doc supported by a modern version of sphinx, so setting both is a compatibility strategy for us to use in order to migrate away from master_doc.

# The root toctree document.
root_doc = master_doc = "index"

@manics
Copy link
Member Author

manics commented Jul 28, 2021

Thanks, I've updated the Sphinx conf.py.

I'm a bit hesistant to change a critical GitHub action to use HEAD without an official statement from the maintainers. We could switch to commit hashes or tags and rely on dependabot to bump them instead, which also means we'd be fully aware of any changes. Alternatively we could switch to release/v1?

Copy link
Member

@consideRatio consideRatio left a comment

Choose a reason for hiding this comment

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

I saw a build error, but this is 100% documentation so go for it

@manics
Copy link
Member Author

manics commented Aug 6, 2021

Thanks @consideRatio.

Let's go for it then! I don't have permission to rename the branch.

@consideRatio consideRatio merged commit 297c795 into jupyterhub:main Aug 6, 2021
@consideRatio
Copy link
Member

Branch renamed!

@manics manics deleted the master-main branch August 6, 2021 19:34
@manics
Copy link
Member Author

manics commented Aug 6, 2021

Thanks! Do you know who's got access to readthedocs to check the branch name?
The Docker Hub artifact has been broken for a while, see #1071

manics added a commit to manics/repo2docker that referenced this pull request Aug 6, 2021
manics added a commit to manics/repo2docker that referenced this pull request Aug 6, 2021
@consideRatio
Copy link
Member

consideRatio commented Aug 6, 2021

@manics from https://readthedocs.org/projects/repo2docker/ I conclude among others @yuvipanda @choldgraf have access to update the readthedocs to not be coupled to the master branch, but instead to the main branch.

Action point for @yuvipanda or @choldgraf:

@choldgraf
Copy link
Member

done 👍

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.

3 participants