Commit 77b6ed1b authored by Zsolt Dollenstein's avatar Zsolt Dollenstein
Browse files

Hello github.com/psf!

parent 90d205d1
Loading
Loading
Loading
Loading
+1 −1
Changes for CONTRIBUTING.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ In terms of inspiration, *Black* is about as configurable as *gofmt*.
This is deliberate.

Bug reports and fixes are always welcome!  Please follow the [issue
template on GitHub](https://github.com/python/black/issues/new) for best 
template on GitHub](https://github.com/psf/black/issues/new) for best 
results.

Before you suggest a new feature or configuration knob, ask yourself why
+11 −11
Changes for README.md: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
![Black Logo](https://raw.githubusercontent.com/python/black/master/docs/_static/logo2-readme.png)
![Black Logo](https://raw.githubusercontent.com/psf/black/master/docs/_static/logo2-readme.png)
<h2 align="center">The Uncompromising Code Formatter</h2>

<p align="center">
<a href="https://travis-ci.org/python/black"><img alt="Build Status" src="https://travis-ci.org/python/black.svg?branch=master"></a>
<a href="https://travis-ci.org/psf/black"><img alt="Build Status" src="https://travis-ci.org/psf/black.svg?branch=master"></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/python/black?branch=master"><img alt="Coverage Status" src="https://coveralls.io/repos/github/python/black/badge.svg?branch=master"></a>
<a href="https://github.com/python/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=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://pypi.org/project/black/"><img alt="PyPI" src="https://black.readthedocs.io/en/stable/_static/pypi.svg"></a>
<a href="https://pepy.tech/project/black"><img alt="Downloads" src="https://pepy.tech/badge/black"></a>
<a href="https://github.com/python/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
<a href="https://github.com/psf/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
</p>

> “Any color you like.”
@@ -373,7 +373,7 @@ The main reason to standardize on a single form of quotes is aesthetics.
Having one kind of quotes everywhere reduces reader distraction.
It will also enable a future version of *Black* to merge consecutive
string literals that ended up on the same line (see
[#26](https://github.com/python/black/issues/26) for details).
[#26](https://github.com/psf/black/issues/26) for details).

Why settle on double quotes?  They anticipate apostrophes in English
text.  They match the docstring standard described in [PEP 257](https://www.python.org/dev/peps/pep-0257/#what-is-a-docstring).
@@ -739,7 +739,7 @@ or with [Vundle](https://github.com/VundleVim/Vundle.vim):
Plugin 'python/black'
```

or you can copy the plugin from [plugin/black.vim](https://github.com/python/black/tree/master/plugin/black.vim).
or you can copy the plugin from [plugin/black.vim](https://github.com/psf/black/tree/master/plugin/black.vim).
Let me know if this requires any changes to work with Vim 8's builtin
`packadd`, or Pathogen, and so on.

@@ -900,7 +900,7 @@ installed](https://pre-commit.com/#install), add this to the
`.pre-commit-config.yaml` in your repository:
```yaml
repos:
-   repo: https://github.com/python/black
-   repo: https://github.com/psf/black
    rev: stable
    hooks:
    - id: black
@@ -974,16 +974,16 @@ and [`pipenv`](https://docs.pipenv.org/):
Use the badge in your project's README.md:

```markdown
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
```

Using the badge in README.rst:
```
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
    :target: https://github.com/python/black
    :target: https://github.com/psf/black
```

Looks like this: [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
Looks like this: [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)


## License
+3 −3
Changes for black.py: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -3548,7 +3548,7 @@ def _v(node: Union[ast3.AST, ast27.AST], depth: int = 0) -> Iterator[str]:
        log = dump_to_file("".join(traceback.format_tb(exc.__traceback__)), dst)
        raise AssertionError(
            f"INTERNAL ERROR: Black produced invalid code: {exc}. "
            f"Please report a bug on https://github.com/python/black/issues.  "
            f"Please report a bug on https://github.com/psf/black/issues.  "
            f"This invalid output might be helpful: {log}"
        ) from None

@@ -3559,7 +3559,7 @@ def _v(node: Union[ast3.AST, ast27.AST], depth: int = 0) -> Iterator[str]:
        raise AssertionError(
            f"INTERNAL ERROR: Black produced code that is not equivalent to "
            f"the source.  "
            f"Please report a bug on https://github.com/python/black/issues.  "
            f"Please report a bug on https://github.com/psf/black/issues.  "
            f"This diff might be helpful: {log}"
        ) from None

@@ -3575,7 +3575,7 @@ def assert_stable(src: str, dst: str, mode: FileMode) -> None:
        raise AssertionError(
            f"INTERNAL ERROR: Black produced different code on the second pass "
            f"of the formatter.  "
            f"Please report a bug on https://github.com/python/black/issues.  "
            f"Please report a bug on https://github.com/psf/black/issues.  "
            f"This diff might be helpful: {log}"
        ) from None

+1 −1
Changes for docs/conf.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ def generate_sections_from_readme():
    "show_related": False,
    "description": "“Any color you like.”",
    "github_button": True,
    "github_user": "python",
    "github_user": "psf",
    "github_repo": "black",
    "github_type": "star",
    "show_powered_by": True,
+1 −1
Changes for docs/environment.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ dependencies:
- Sphinx==1.7.2
- pip:
  - recommonmark==0.4.0
  - git+https://git@github.com/python/black.git
  - git+https://git@github.com/psf/black.git
Loading