renaming master to main on all SciPy repos soon
Hi all, This is a heads up that Jarrod Millman and I plan to work on renaming master to main on all repos over the holidays. Jarrod had offered to help with this a while back already, and I'd asked him to wait till a quiet period so I'd have bandwidth to review and help fix anything in case it broke. Which is this holiday period. For NumPy this was done back in March already [1], and it went smoothly. GitHub is now much better at doing this than a year ago, so it's not a lot of work anymore and there should not be any merge conflicts or other impact beyond making changes to scripts and CI config files that explicitly use the "master" name, plus the short procedure in the linked NumPy email to update your local clones for the change. Cheers, Ralf [1] https://mail.python.org/archives/list/numpy-discussion@python.org/message/CY...
Hi all, This is done now. To account for these changes on your local git clone, you can do: git fetch origin git fetch upstream # this is our recommended naming, it may be called `origin` for you git branch -i upstream/main main git remote set-head upstream -a GitHub will also show you these instructions in a popup if you visit https://github.com/scipy/scipy/ for the first time after the rename. Things went fairly smoothly. The only unexpected thing that happened is that 24 PRs were auto-closed. The reason for that is that either the repo or branch from which the PR was originally submitted was deleted by the contributor. In case this happened to your PR, please feel free to submit it. If you were following or reviewing someone else's PR and you care about that PR, please feel free to take over the commits and resubmit as a new PR (preserving original authorship). This should be easy to do, e.g. with the `hub` or `gh` CLI tools for GitHub: hub pr checkout 12345 git rebase main If you are having trouble, please ping me on the issue/PR. Cheers, Ralf On Fri, Dec 24, 2021 at 1:42 PM Ralf Gommers <ralf.gommers@gmail.com> wrote:
Hi all,
This is a heads up that Jarrod Millman and I plan to work on renaming master to main on all repos over the holidays. Jarrod had offered to help with this a while back already, and I'd asked him to wait till a quiet period so I'd have bandwidth to review and help fix anything in case it broke. Which is this holiday period.
For NumPy this was done back in March already [1], and it went smoothly. GitHub is now much better at doing this than a year ago, so it's not a lot of work anymore and there should not be any merge conflicts or other impact beyond making changes to scripts and CI config files that explicitly use the "master" name, plus the short procedure in the linked NumPy email to update your local clones for the change.
Cheers, Ralf
[1] https://mail.python.org/archives/list/numpy-discussion@python.org/message/CY...
On 1/3/22, Ralf Gommers <ralf.gommers@gmail.com> wrote:
Hi all,
This is done now. To account for these changes on your local git clone, you can do:
git fetch origin git fetch upstream # this is our recommended naming, it may be called `origin` for you git branch -i upstream/main main
Is that a typo? The pop-up on github uses -u, not -i. Warren
git remote set-head upstream -a
GitHub will also show you these instructions in a popup if you visit https://github.com/scipy/scipy/ for the first time after the rename.
Things went fairly smoothly. The only unexpected thing that happened is that 24 PRs were auto-closed. The reason for that is that either the repo or branch from which the PR was originally submitted was deleted by the contributor. In case this happened to your PR, please feel free to submit it. If you were following or reviewing someone else's PR and you care about that PR, please feel free to take over the commits and resubmit as a new PR (preserving original authorship). This should be easy to do, e.g. with the `hub` or `gh` CLI tools for GitHub:
hub pr checkout 12345 git rebase main
If you are having trouble, please ping me on the issue/PR.
Cheers, Ralf
On Fri, Dec 24, 2021 at 1:42 PM Ralf Gommers <ralf.gommers@gmail.com> wrote:
Hi all,
This is a heads up that Jarrod Millman and I plan to work on renaming master to main on all repos over the holidays. Jarrod had offered to help with this a while back already, and I'd asked him to wait till a quiet period so I'd have bandwidth to review and help fix anything in case it broke. Which is this holiday period.
For NumPy this was done back in March already [1], and it went smoothly. GitHub is now much better at doing this than a year ago, so it's not a lot of work anymore and there should not be any merge conflicts or other impact beyond making changes to scripts and CI config files that explicitly use the "master" name, plus the short procedure in the linked NumPy email to update your local clones for the change.
Cheers, Ralf
[1] https://mail.python.org/archives/list/numpy-discussion@python.org/message/CY...
On Mon, Jan 3, 2022 at 7:49 PM Warren Weckesser <warren.weckesser@gmail.com> wrote:
On 1/3/22, Ralf Gommers <ralf.gommers@gmail.com> wrote:
Hi all,
This is done now. To account for these changes on your local git clone, you can do:
git fetch origin git fetch upstream # this is our recommended naming, it may be called `origin` for you git branch -i upstream/main main
Is that a typo? The pop-up on github uses -u, not -i.
Yes sorry, that was a typo, should be -u Ralf
git remote set-head upstream -a
GitHub will also show you these instructions in a popup if you visit https://github.com/scipy/scipy/ for the first time after the rename.
Things went fairly smoothly. The only unexpected thing that happened is that 24 PRs were auto-closed. The reason for that is that either the repo or branch from which the PR was originally submitted was deleted by the contributor. In case this happened to your PR, please feel free to submit it. If you were following or reviewing someone else's PR and you care
that PR, please feel free to take over the commits and resubmit as a new PR (preserving original authorship). This should be easy to do, e.g. with
about the
`hub` or `gh` CLI tools for GitHub:
hub pr checkout 12345 git rebase main
If you are having trouble, please ping me on the issue/PR.
Cheers, Ralf
On Fri, Dec 24, 2021 at 1:42 PM Ralf Gommers <ralf.gommers@gmail.com> wrote:
Hi all,
This is a heads up that Jarrod Millman and I plan to work on renaming master to main on all repos over the holidays. Jarrod had offered to help with this a while back already, and I'd asked him to wait till a quiet period so I'd have bandwidth to review and help fix anything in case it broke. Which is this holiday period.
For NumPy this was done back in March already [1], and it went smoothly. GitHub is now much better at doing this than a year ago, so it's not a lot of work anymore and there should not be any merge conflicts or other impact beyond making changes to scripts and CI config files that explicitly use the "master" name, plus the short procedure in the linked NumPy email to update your local clones for the change.
Cheers, Ralf
[1]
https://mail.python.org/archives/list/numpy-discussion@python.org/message/CY...
_______________________________________________ SciPy-Dev mailing list -- scipy-dev@python.org To unsubscribe send an email to scipy-dev-leave@python.org https://mail.python.org/mailman3/lists/scipy-dev.python.org/ Member address: ralf.gommers@gmail.com
On Mon, Jan 3, 2022 at 9:50 PM Warren Weckesser <warren.weckesser@gmail.com> wrote:
On 1/3/22, Ralf Gommers <ralf.gommers@gmail.com> wrote:
Hi all,
This is done now. To account for these changes on your local git clone, you can do:
git fetch origin git fetch upstream # this is our recommended naming, it may be called `origin` for you git branch -i upstream/main main
Is that a typo? The pop-up on github uses -u, not -i.
For me neither worked: $ git fetch upstream .... $ git br -u upstream/main main fatal: branch 'main' does not exist $ git br -i upstream/main main fatal: Not a valid object name: 'main'. However, just `$ git co main` worked: $ git co main Branch 'main' set up to track remote branch 'main' from 'upstream'. Switched to a new branch 'main' $ git log main commit 8a64c938ddf1ae4c02a08d2c5e38daeb8d061d38 (HEAD -> main, upstream/main) Author: Jarrod Millman <jarrod.millman@gmail.com> Date: Mon Jan 3 08:34:26 2022 -0800 MAINT: changed needed after renaming `master` branch to `main` (#15314) Co-authored-by: Ralf Gommers <ralf.gommers@gmail.com> Evgeni
participants (3)
-
Evgeni Burovski -
Ralf Gommers -
Warren Weckesser