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

[REF] Replaces master with main where possible #667

Merged
merged 5 commits into from
Feb 1, 2021
Merged

[REF] Replaces master with main where possible #667

merged 5 commits into from
Feb 1, 2021

Conversation

jbteves
Copy link
Collaborator

@jbteves jbteves commented Jan 29, 2021

Addresses but does not close #619 .

Changes proposed in this pull request:

  • Switch master to main where applicable

NOTE: due to versioneer and the document doc tree, there are some references to master that cannot be changed from my read. All examples below:

docs/conf.py:67:# The master toctree document.
docs/conf.py:68:master_doc = 'index'
docs/governance.rst:184:`decision-making rules for the BIDS standard <https://github.com/bids-standard/bids-specification/blob/master/DECISION-MAKING.md>`_,
tedana/_version.py:192:        # "stabilization", as well as "HEAD" and "master".
versioneer.py:18:(https://travis-ci.org/warner/python-versioneer.png?branch=master)
versioneer.py:179:  "master" and "slave" subprojects, each with their own `setup.py`,
versioneer.py:612:        # "stabilization", as well as "HEAD" and "master".
versioneer.py:1004:        # "stabilization", as well as "HEAD" and "master".

@codecov
Copy link

codecov bot commented Jan 29, 2021

Codecov Report

Merging #667 (f5d3913) into master (74b922d) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #667   +/-   ##
=======================================
  Coverage   93.75%   93.75%           
=======================================
  Files          26       26           
  Lines        2019     2019           
=======================================
  Hits         1893     1893           
  Misses        126      126           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 74b922d...f5d3913. Read the comment docs.

@jbteves jbteves requested review from tsalo and emdupre January 29, 2021 21:55
tsalo
tsalo previously approved these changes Jan 30, 2021
Copy link
Member

@tsalo tsalo left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for doing this.

Copy link
Member

@emdupre emdupre left a comment

Choose a reason for hiding this comment

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

Thanks for this, @jbteves !

I'm getting three external links that don't (yet) resolve with main, so I think we'll need to revert those changes for now. But overall, very happy to have this updated !!

CONTRIBUTING.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
tedana/due.py Outdated Show resolved Hide resolved
@jbteves
Copy link
Collaborator Author

jbteves commented Feb 1, 2021

Oh, silly me, good catches @emdupre !

Co-authored-by: Elizabeth DuPre <[email protected]>
jbteves and others added 2 commits February 1, 2021 10:28
Co-authored-by: Elizabeth DuPre <[email protected]>
Co-authored-by: Elizabeth DuPre <[email protected]>
@jbteves
Copy link
Collaborator Author

jbteves commented Feb 1, 2021

I think the issue was that at some point GitHub had stated they would redirect main and master correctly for you, but I didn't check and it seems that's not implemented. My fault for not checking.

@emdupre
Copy link
Member

emdupre commented Feb 1, 2021

I think the issue was that at some point GitHub had stated they would redirect main and master correctly for you, but I didn't check and it seems that's not implemented. My fault for not checking.

No worries ! I was confused on that too -- the scikit link redirects correctly from master to main, but I think that's only because they've made a main branch already. The remaining links still only have the master branch, it seems. Regardless, I think these changes are now ready to go !

@jbteves
Copy link
Collaborator Author

jbteves commented Feb 1, 2021

So my plan to proceed, once we have approvals, is to do the following:

  • Merge this PR.
  • Throw the switch from master to main.
  • Pin Set default branch to main #619 , with the top comment edited with the instructions and reiterating that I'm the point of contact if developers need help.
  • If issues arise, try to tackle them tonight.

If there's no objections, then pending the additional review from @tsalo I'll go ahead.

EDIT: Actually, I don't have permission to throw the switch, so either I need to be granted permission or someone else will need to.

Copy link
Collaborator

@eurunuela eurunuela left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you @jbteves . If we miss something we'll see after merging anyway. I'll be checking my notifications in case you need any help.

@tsalo tsalo merged commit 65a285d into ME-ICA:master Feb 1, 2021
@tsalo tsalo mentioned this pull request Feb 1, 2021
3 tasks
@tsalo
Copy link
Member

tsalo commented Feb 1, 2021

I've done the rename, but I'll also make sure you have permissions for the future.

@jbteves jbteves deleted the switch_to_main branch February 2, 2021 00:44
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.

Set default branch to main
4 participants