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

Change branch name to main #13985

Open
cdce8p opened this issue Nov 1, 2022 · 8 comments · May be fixed by #15311
Open

Change branch name to main #13985

cdce8p opened this issue Nov 1, 2022 · 8 comments · May be fixed by #15311
Labels
topic-developer Issues relevant to mypy developers

Comments

@cdce8p
Copy link
Collaborator

cdce8p commented Nov 1, 2022

Typeshed just changed the name of the default branch from master to main python/typeshed#8956.
With the upcoming 1.0 release (#13685), I think it could make sense to do that for mypy, too.

Github does make it quite easy so we would likely only need to update a few references.
Besides that contributors would need to run these commands to update their local copy

git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a
@denballakh
Copy link
Contributor

I don't think it's worth it. What's wrong with master?
If this is changed, then nothing good will happen, there will only be inconvenience for some contributors.

@sobolevn
Copy link
Member

sobolevn commented Nov 2, 2022

Both cpython and typeshed are using main now. I think it will be more consistent.

However, I am not a native english speaker, both of these words mean nothing to me. In my language master is someone who is good at something.
So, I don't really care.

@AlexWaygood AlexWaygood added the topic-developer Issues relevant to mypy developers label Nov 3, 2022
@cdce8p cdce8p mentioned this issue Nov 9, 2022
17 tasks
@antonagestam
Copy link
Contributor

The reasons as to why this change of terminology matters are well documented and debated already and shouldn't really need repeating here at this point, for y'all failing to use Google:

Yes, this is "just" language, so let's just make the change and get on with our lives. Can we please just learn from where all these discussions have landed, and not repeat them again all over?

@JukkaL
Copy link
Collaborator

JukkaL commented Nov 9, 2022

I'm fine with changing the branch name to main, but let's wait until 1.0 and any 1.0.x point releases are out to avoid disruption, i.e. let's do it between release cycles. 1.0 should be out within a month or so.

@cdce8p
Copy link
Collaborator Author

cdce8p commented May 25, 2023

I'm fine with changing the branch name to main, but let's wait until 1.0 and any 1.0.x point releases are out to avoid disruption, i.e. let's do it between release cycles. 1.0 should be out within a month or so.

Maybe now could be a good time to do it. 1.3 has been out for two weeks and it doesn't look like 1.3.1 is necessary. Furthermore, the release-1.4 branch hasn't been cut yet.

Anyhow, the impact should be quite minimal. We'll probably only need to update the branch name in the Github actions workflow files and the readthedocs config. Links should continue to work although we could update these as well, of course.

branches: [master, 'release*']

@hugovk
Copy link
Member

hugovk commented May 25, 2023

Some other bits:

CREDITS
5:https://github.com/python/mypy/commits/master

README.md
105:python3 -m pip install -U https://github.com/python/mypy/zipball/master

.github/PULL_REQUEST_TEMPLATE.md
7:- Read the [Contributing Guidelines](https://github.com/python/mypy/blob/master/CONTRIBUTING.md)

docs/source/extending_mypy.rst
96:`mypy/plugin.py <https://github.com/python/mypy/blob/master/mypy/plugin.py>`_
98:located in `mypy/plugins <https://github.com/python/mypy/tree/master/mypy/plugins>`_.

mypy/errors.py
1153:        "Please try using mypy master on GitHub:\n"
1162:            "If this issue continues with mypy master, "

mypyc/doc/dev-intro.md
66:the [mypy docs](https://github.com/python/mypy/blob/master/README.md).

@cdce8p
Copy link
Collaborator Author

cdce8p commented May 26, 2023

I opened two PRs to help with the transition

JelleZijlstra pushed a commit that referenced this issue May 30, 2023
Preparation for #13985 to make the transition from `master` to `main` as
seamless as possible.
This PR can be merged as is preferably before the branch is renamed to
avoid issues.
@hugovk
Copy link
Member

hugovk commented Nov 11, 2023

I'm fine with changing the branch name to main, but let's wait until 1.0 and any 1.0.x point releases are out to avoid disruption, i.e. let's do it between release cycles. 1.0 should be out within a month or so.

Mypy 1.7 was just released! 🎉

Is now a good time to flip the switch?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic-developer Issues relevant to mypy developers
Projects
None yet
Development

Successfully merging a pull request may close this issue.

7 participants