Unverified Commit 06ccb88b authored by Panagiotis Vasilopoulos's avatar Panagiotis Vasilopoulos Committed by GitHub
Browse files

Replace references to master branch (#2210)

Commit history before merge:

* Replace references to master branch
* Update .flake8 to reference docs on RTD

  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!).

  Co-authored-by: default avatarRichard Si <63936253+ichard26@users.noreply.github.com>
parent 50205777
Loading
Loading
Loading
Loading
+1 −1
Changes for .flake8: 1 added line, 1 removed line.
Original line number Diff line number Diff line
[flake8]
extend-ignore = E203, E266, E501
# line length is intentionally set to 80 here because black uses Bugbear
# See https://github.com/psf/black/blob/master/docs/the_black_code_style.md#line-length for more details
# See https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-length for more details
max-line-length = 80
max-complexity = 18
select = B,C,E,F,W,T4,B9
+4 −4
Changes for .github/ISSUE_TEMPLATE/bug_report.md: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ assignees: ""

**Environment (please complete the following information):**

- Version: \[e.g. master\]
- Version: \[e.g. main\]
- OS and Python version: \[e.g. Linux/Python 3.7.4rc1\]

**Does this bug also happen on master?** To answer this, you have two options:
**Does this bug also happen on main?** To answer this, you have two options:

1. Use the online formatter at <https://black.vercel.app/?version=master>, which will
   use the latest master branch.
1. Use the online formatter at <https://black.vercel.app/?version=main>, which will use
   the latest main branch.
1. Or run _Black_ on your machine:
   - create a new virtualenv (make sure it's the same Python version);
   - clone this repository;
+4 −0
Changes for CHANGES.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@

### Documentation

- Replaced all remaining references to the
  [`master`](https://github.com/psf/black/tree/main) branch with the
  [`main`](https://github.com/psf/black/tree/main) branch. Some additional changes in
  the source code were also made. (#2210)
- Sigificantly reorganized the documentation to make much more sense. Check them out by
  heading over to [the stable docs on RTD](https://black.readthedocs.io/en/stable/).
  (#2174)
+3 −3
Changes for README.md: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
![Black Logo](https://raw.githubusercontent.com/psf/black/master/docs/_static/logo2-readme.png)
![Black Logo](https://raw.githubusercontent.com/psf/black/main/docs/_static/logo2-readme.png)

<h2 align="center">The Uncompromising Code Formatter</h2>

@@ -6,8 +6,8 @@
<a href="https://github.com/psf/black/actions"><img alt="Actions Status" src="https://github.com/psf/black/workflows/Test/badge.svg"></a>
<a href="https://github.com/psf/black/actions"><img alt="Actions Status" src="https://github.com/psf/black/workflows/Primer/badge.svg"></a>
<a href="https://black.readthedocs.io/en/stable/?badge=stable"><img alt="Documentation Status" src="https://readthedocs.org/projects/black/badge/?version=stable"></a>
<a href="https://coveralls.io/github/psf/black?branch=master"><img alt="Coverage Status" src="https://coveralls.io/repos/github/psf/black/badge.svg?branch=master"></a>
<a href="https://github.com/psf/black/blob/master/LICENSE"><img alt="License: MIT" src="https://black.readthedocs.io/en/stable/_static/license.svg"></a>
<a href="https://coveralls.io/github/psf/black?branch=main"><img alt="Coverage Status" src="https://coveralls.io/repos/github/psf/black/badge.svg?branch=main"></a>
<a href="https://github.com/psf/black/blob/main/LICENSE"><img alt="License: MIT" src="https://black.readthedocs.io/en/stable/_static/license.svg"></a>
<a href="https://pypi.org/project/black/"><img alt="PyPI" src="https://img.shields.io/pypi/v/black"></a>
<a href="https://pepy.tech/project/black"><img alt="Downloads" src="https://pepy.tech/badge/black"></a>
<a href="https://anaconda.org/conda-forge/black/"><img alt="conda-forge" src="https://img.shields.io/conda/dn/conda-forge/black.svg?label=conda-forge"></a>
+1 −1
Changes for docs/contributing/the_basics.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ $ sphinx-build -a -b html -W docs/ docs/_build/
if we get source code changes. It will error on formatting changes or errors. Please run
before pushing your PR to see if you get the actions you would expect from _Black_ with
your PR. You may need to change
[primer.json](https://github.com/psf/black/blob/master/src/black_primer/primer.json)
[primer.json](https://github.com/psf/black/blob/main/src/black_primer/primer.json)
configuration for it to pass.

For more `black-primer` information visit the
Loading