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

Replace references to master branch #2210

Merged
merged 2 commits into from May 9, 2021
Merged

Replace references to master branch #2210

merged 2 commits into from May 9, 2021

Conversation

n0toose
Copy link
Contributor

@n0toose n0toose commented May 9, 2021

@n0toose
Copy link
Contributor Author

n0toose commented May 9, 2021

Is there something specific that I've happened to miss that broke the checks, or was it because of the tree I used?

@cooperlees
Copy link
Collaborator

cooperlees commented May 9, 2021

Just seems .github/ISSUE_TEMPLATE/bug_report.md formatting just need to be fixed by prettier.

If you run pre-commit locally it'll fix it.

@n0toose
Copy link
Contributor Author

n0toose commented May 9, 2021

Just seems .github/ISSUE_TEMPLATE/bug_report.md formatting just need to be fixed by prettier.

If you run pre-commit locally it'll fix it.

On it, I'll also add a CHANGE.md message and force-push. Thank you!

@ichard26
Copy link
Collaborator

ichard26 commented May 9, 2021

Sorry, but there's more references to master in gallery/, an utility script. Could you please fix them? Thank you!

Also good call on the changelog entry, this next release is going to break a lot of things... and this change will probably make that breakage even worse 😆 I'm on the fence about putting this change under documentation since while these changes are in the docs, for users any CI, random scripts, etc. references to master they have don't make sense from a documentation point of view. But then again, I can't think of anything better (Black and packaging also aren't IMO good for similar reasons).

@n0toose
Copy link
Contributor Author

n0toose commented May 9, 2021

Sorry, but there's more references to master in gallery/, an utility script. Could you please fix them? Thank you!

Sure thing, I was actually just very hesitant to fix them. I'll see what I can do and get back to you if there's anything wrong.

I'll note that I'm also going to change this line, which is a reference to cpython and irrelevant to black:

version = "master"

Also good call on the changelog entry, this next release is going to break a lot of things... and this change will probably make that breakage even worse

I don't think it will, it's mostly just documentation-related changes. Unless if you're referring to the transition from the master branch to main. GitHub just redirects that sort of stuff, sometimes.

@n0toose
Copy link
Contributor Author

n0toose commented May 9, 2021

Additional note: I frankly have no idea why the CI check is freaking out. The test passes on my machine, can't see any tab/space-related sort of difference.

@n0toose
Copy link
Contributor Author

n0toose commented May 9, 2021

I added an additional note regarding some source code changes, but I didn't see the changes as substantial enough to move the log away from the Documentation section.

Moreover:

(black) ~ $ pre-commit run -a
black....................................................................Passed
flake8...................................................................Passed
mypy.....................................................................Passed
prettier.................................................................Passed

Copy link
Collaborator

@ichard26 ichard26 left a comment

Choose a reason for hiding this comment

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

Thank you! Congrats on your first contribution to Black.

I'll commit my suggestion myself so you don't have to spend more time on this. I'll merge once CI passes.

Comment on lines +26 to +27
1. Use the online formatter at <https://black.vercel.app/?version=main>, which will use
the latest main branch.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Looks like the Black Playground breaks on this version value, I'll see I can submit a PR over there later today so this doesn't stay broken.

.flake8 Outdated Show resolved Hide resolved
We're moving away from GitHub as a documentation host to only RTD because it's makes our lives easier creating good docs. I know this link is dead right now, but it won't be once we release a new version with the documentation reorganization changes (which should be soon!).
@ichard26
Copy link
Collaborator

ichard26 commented May 9, 2021

I may or may not have forgotten about this PR... whoops!

Clicking the magical green button now.

@ichard26 ichard26 merged commit 06ccb88 into psf:main May 9, 2021
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.

None yet

4 participants