MNT: Replace master with main #11379

pllim · 2021-03-09T16:42:14Z

This PR attempts to replace all mention of master to main in this repository. This should be reviewed and merged right after the maintainer has renamed the default branch.

This is an automated update made by the batchpr tool 🤖 - feel free to close if it doesn't look good! You can report issues to @pllim.

This is part of #11378

Fix #11381

TODO

@eteq to update README with instructions, see MNT: Replace master with main #11379 (comment)
Do we need a change log? See MNT: Replace master with main #11379 (comment)

pllim · 2021-03-09T16:50:37Z

This might have to wait for other repos in the org to catch up.

Also, I think we need to backport to avoid broken links... or we need to keep master as mirror to main.

pep8speaks · 2021-03-09T17:15:20Z

Hello @pllim 👋! It looks like you've made some changes in your pull request, so I've checked the code again for style.

There are no PEP8 style issues with this pull request - thanks! 🎉

Comment last updated at 2021-04-02 22:27:27 UTC

bsipocz

In some places, the master->main changes don't make much sense, but overall these changes only depend on the APE and ci-helpers repos, so we're in a pretty good shape.

astropy/config/tests/data/astropy.0.3.cfg

astropy/config/configuration.py

astropy/config/tests/data/astropy.0.3.windows.cfg

astropy/coordinates/sky_coordinate.py

astropy/extern/ply/lex.py

docs/index.rst

bsipocz · 2021-03-09T20:58:26Z

docs/io/ascii/fast_ascii_io.rst

@@ -144,7 +144,7 @@ relatively unimportant, this converter might be the best option in
 performance-critical scenarios.

 `Here
-<https://nbviewer.jupyter.org/github/astropy/astropy-notebooks/blob/master/io/ascii/conversion_profile.ipynb>`__
+<https://nbviewer.jupyter.org/github/astropy/astropy-notebooks/blob/main/io/ascii/conversion_profile.ipynb>`__


Unrelated to this PR, but are these notebooks are not tested and in fact don't work any more, so better to remove them from the docs altogether.

OK, let's continue discussion at #11381.

This will also require re-naming that repo's branch, but I'll just do that right now since it's incredibly low traffic.

Notebooks are removed. But if we want to keep that repo, should just rename the branch there anyway though that is out of scope of this PR now.

astropy/coordinates/tests/test_regression.py

eteq · 2021-03-18T14:08:42Z

I'll try to give this a proper review soon, but one immediate thought: I think this arguably belongs in 4.2.x not 4.0.x - the LTS in principle shouldn't have anything to do with master, and only does via the dev docs. And while this is debatable, I think it's reasonable to leave the core content of the dev docs alone for the LTS given that this is almost like a "feature".

FWIW, I don't necessarily object to this, but if the backport is going to take significantly more effort for LTS I think it's not cirtical.

Regardless, I don't think it needs to block 4.0.5 so I'm going to re-milestone it to the next LTS.

eteq

LGTM!

But one procedural question: I should probably merge this at the same time as making the name change, right, so that there's a minimal time of being out-of-sync? If so were you thinking I should make the README update as a push to master, or did you want to add this here, @pllim?

eteq · 2021-03-18T19:06:00Z

docs/io/unified.rst

@@ -5,7 +5,7 @@ Unified File Read/Write Interface

 ``astropy`` provides a unified interface for reading and writing data in
 different formats. For many common cases this will streamline the process of
-file I/O and reduce the need to master the separate details of all of the I/O
+file I/O and reduce the need to learn the separate details of all of the I/O


You know, I'm not really sure this change is necessary since I think this is the one use of "master" that has a different etymology. But "learn" actually works fine here and sounds better to me anyway. Just not something we necessarily have to stay vigilant about in the future 🤷.

It was a blind sed run and I thought "might as well"...

eteq · 2021-03-18T19:06:41Z

docs/io/ascii/fast_ascii_io.rst

@@ -144,7 +144,7 @@ relatively unimportant, this converter might be the best option in
 performance-critical scenarios.

 `Here
-<https://nbviewer.jupyter.org/github/astropy/astropy-notebooks/blob/master/io/ascii/conversion_profile.ipynb>`__
+<https://nbviewer.jupyter.org/github/astropy/astropy-notebooks/blob/main/io/ascii/conversion_profile.ipynb>`__


This will also require re-naming that repo's branch, but I'll just do that right now since it's incredibly low traffic.

pllim · 2021-03-18T19:50:45Z

should probably merge this at the same time as making the name change, right, so that there's a minimal time of being out-of-sync?

Ideally, this should be merged soon after you change the default branch. Given CI was failing, might want to retrigger to make sure I didn't break anything after name change but before merge.

should make the README update as a push to master, or did you want to add this here

I already updated the README as part of this PR. Or are you referring to something else?

eteq · 2021-03-18T21:11:22Z

I already updated the README as part of this PR. Or are you referring to something else?

Oh, sorry, @pllim, I meant specifically the README update along the lines of here or similar: astropy/astropy-project#151 (comment) - you did indeed fix the to-be-broken links, I just meant the informational addition.

pllim · 2021-03-18T21:15:14Z

I meant specifically the README update along the lines of here

Oh. Feel free to push to this PR or as follow-up PR. The discussions were quiet long and I forgot what the conclusion was. 😅

docs/io/ascii/fast_ascii_io.rst

pllim · 2021-03-19T13:37:04Z

@eteq , this should be ready, except for the remaining README change that you mentioned in #11379 (comment) , which can be handled separately.

taldcroft · 2021-03-19T13:47:02Z

@pllim - the changes related to the io.ascii notebooks look fine, thanks!

Revert out-of-scope changes. Replace some words in narrative. Apply suggestions from bsipocz DOC: Remove mentioned of astropy-notebooks Co-authored-by: Brigitta Sipőcz <b.sipocz@gmail.com>

pllim · 2021-04-02T20:18:45Z

Update: Originally, I had a change log entry (Renamed default branch from ``master`` to ``main``. [#11379]) under other changes but now I am wondering if the entry is still needed and if so, how to do it with towncrier.

eteq · 2021-04-02T22:27:56Z

changelog updated in e174a67 following the new towncrier method

eteq · 2021-04-07T19:43:26Z

I'm doing it!

MNT: Replace master with main

github-actions bot added config coordinates Docs external PRs and issues related to external packages vendored with Astropy (astropy.extern) installation io.ascii io.fits modeling nddata Release table testing unified-io units utils visualization wcs labels Mar 9, 2021

pllim mentioned this pull request Mar 9, 2021

MNT: Rename default branch from master to main #11378

Closed

3 tasks

pllim added this to the v4.3 milestone Mar 9, 2021

pllim modified the milestones: v4.3, v4.0.5 Mar 9, 2021

pllim added Refactoring and removed external PRs and issues related to external packages vendored with Astropy (astropy.extern) labels Mar 9, 2021

bsipocz approved these changes Mar 9, 2021

View reviewed changes

pllim mentioned this pull request Mar 9, 2021

DOC: Stop linking to astropy-notebooks #11381

Closed

saimn reviewed Mar 10, 2021

View reviewed changes

astropy/coordinates/tests/test_regression.py Outdated Show resolved Hide resolved

pllim commented Mar 10, 2021

View reviewed changes

astropy/coordinates/tests/test_regression.py Outdated Show resolved Hide resolved

eteq modified the milestones: v4.0.5, v4.0.6 Mar 18, 2021

eteq approved these changes Mar 18, 2021

View reviewed changes

pllim force-pushed the replace-with-main branch from 6639c33 to ad2e05e Compare March 19, 2021 13:28

pllim commented Mar 19, 2021

View reviewed changes

docs/io/ascii/fast_ascii_io.rst Show resolved Hide resolved

aaryapatil mentioned this pull request Mar 28, 2021

DOC : Fix broken links to astropy-notebooks #11440

Closed

pllim force-pushed the replace-with-main branch from 328c15e to 125c936 Compare April 2, 2021 20:03

MNT: Replace master with main

6b12387

Revert out-of-scope changes. Replace some words in narrative. Apply suggestions from bsipocz DOC: Remove mentioned of astropy-notebooks Co-authored-by: Brigitta Sipőcz <b.sipocz@gmail.com>

pllim force-pushed the replace-with-main branch from 125c936 to 6b12387 Compare April 2, 2021 20:07

eteq added 2 commits April 2, 2021 16:28

add README disclaimer about master->main

2ad6a7d

add changelog entry

e174a67

pllim mentioned this pull request Apr 5, 2021

DOC: Fix vizier unit link #11480

Merged

eteq merged commit aef38c7 into astropy:master Apr 7, 2021

pllim deleted the replace-with-main branch April 7, 2021 20:17

pllim mentioned this pull request Apr 8, 2021

DOC: Change remaining master to main #11503

Merged

astrofrog pushed a commit that referenced this pull request Aug 16, 2021

Merge pull request #11379 from pllim/replace-with-main

7d2f1e2

MNT: Replace master with main

astrofrog added a commit that referenced this pull request Aug 17, 2021

Added updated hash for config file following comment update in #11379

06cb3c8

astrofrog added a commit that referenced this pull request Aug 19, 2021

Fix backport of #11379

a403b87

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MNT: Replace master with main #11379

MNT: Replace master with main #11379

pllim commented Mar 9, 2021 •

edited

Loading

pllim commented Mar 9, 2021

pep8speaks commented Mar 9, 2021 •

edited

Loading

bsipocz left a comment

bsipocz Mar 9, 2021

pllim Mar 9, 2021

eteq Mar 18, 2021

pllim Apr 2, 2021

eteq commented Mar 18, 2021

eteq left a comment

eteq Mar 18, 2021

pllim Mar 18, 2021

eteq Mar 18, 2021

pllim commented Mar 18, 2021

eteq commented Mar 18, 2021 •

edited

Loading

pllim commented Mar 18, 2021

pllim commented Mar 19, 2021

taldcroft commented Mar 19, 2021

pllim commented Apr 2, 2021

eteq commented Apr 2, 2021

eteq commented Apr 7, 2021

MNT: Replace master with main #11379

MNT: Replace master with main #11379

Conversation

pllim commented Mar 9, 2021 • edited Loading

TODO

pllim commented Mar 9, 2021

pep8speaks commented Mar 9, 2021 • edited Loading

Comment last updated at 2021-04-02 22:27:27 UTC

bsipocz left a comment

Choose a reason for hiding this comment

bsipocz Mar 9, 2021

Choose a reason for hiding this comment

pllim Mar 9, 2021

Choose a reason for hiding this comment

eteq Mar 18, 2021

Choose a reason for hiding this comment

pllim Apr 2, 2021

Choose a reason for hiding this comment

eteq commented Mar 18, 2021

eteq left a comment

Choose a reason for hiding this comment

eteq Mar 18, 2021

Choose a reason for hiding this comment

pllim Mar 18, 2021

Choose a reason for hiding this comment

eteq Mar 18, 2021

Choose a reason for hiding this comment

pllim commented Mar 18, 2021

eteq commented Mar 18, 2021 • edited Loading

pllim commented Mar 18, 2021

pllim commented Mar 19, 2021

taldcroft commented Mar 19, 2021

pllim commented Apr 2, 2021

eteq commented Apr 2, 2021

eteq commented Apr 7, 2021

pllim commented Mar 9, 2021 •

edited

Loading

pep8speaks commented Mar 9, 2021 •

edited

Loading

eteq commented Mar 18, 2021 •

edited

Loading