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 master to main references #4202

Merged
merged 5 commits into from
Jun 21, 2021

Conversation

bjlittle
Copy link
Member

🚀 Pull Request

Description

After the renaming of the iris/master branch to iris/main, this pull-request changes all relevant master references to be main within iris.


Consult Iris pull request check list

@bjlittle bjlittle force-pushed the change-master-to-main branch from e12a7e4 to f3786ab Compare June 21, 2021 13:58
@bjlittle
Copy link
Member Author

isort is misbehaving under nox with pip... I'll take a look at that 👍

@trexfeathers trexfeathers self-requested a review June 21, 2021 14:08
@trexfeathers trexfeathers self-assigned this Jun 21, 2021
Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

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

Good stuff @bjlittle

See my comments below.

Beyond that, I can confirm that all remaining mentions of the word "master" in the repo are unrelated to Iris' own branch structure.

@trexfeathers
Copy link
Contributor

trexfeathers commented Jun 21, 2021

isort is misbehaving under nox with pip... I'll take a look at that 👍

We've suffered due to isort's latest version changing under our feet. The intent to make pre-commit's versions king - discussed in #4181 - would avoid this happening in future. Either:

@bjlittle bjlittle marked this pull request as draft June 21, 2021 15:53
@bjlittle bjlittle force-pushed the change-master-to-main branch from 1b72237 to 9ed6341 Compare June 21, 2021 16:12
@bjlittle bjlittle marked this pull request as ready for review June 21, 2021 16:12
@trexfeathers trexfeathers merged commit 2336ad4 into SciTools:main Jun 21, 2021
@bjlittle
Copy link
Member Author

@trexfeathers Awesome, thanks 👍

@bjlittle bjlittle mentioned this pull request Jun 21, 2021
@bjlittle bjlittle deleted the change-master-to-main branch June 22, 2021 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants