]> git.madduck.net Git - etc/vim.git/log

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

etc/vim.git
3 years agocompatible isort config: mention profile first (#2180)
reka [Tue, 4 May 2021 08:48:59 +0000 (10:48 +0200)]
compatible isort config: mention profile first (#2180)

Change the order of possible ways to configure isort:
1. using the profile black
2. custom configuration

Formats section:
change the examples to use the profile black

Co-authored-by: Richard Si <63936253+ichard26@users.noreply.github.com>
3 years agoDrop Travis CI and migrate Coveralls (#2186)
Richard Si [Tue, 4 May 2021 08:47:59 +0000 (04:47 -0400)]
Drop Travis CI and migrate Coveralls (#2186)

Travis CI for Open Source is shutting down in a few weeks so the queue
for jobs is insane due to lower resources. I'm 99.99% sure we don't need
it as our Test, Lint, Docs, Upload / Package, Primer, and Fuzz workflows
are all on GitHub Actions. So even though we *can* migrate to the .com
version with its 1000 free Linux minutes(?), I don't think we need to.

more information here:
- https://blog.travis-ci.com/oss-announcement
- https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing
- https://docs.travis-ci.com/user/migrate/open-source-repository-migration

This commit does the following:
- delete the Travis CI configuration
- add to the GHA test workflows so coverage continues to be recorded
  - tweaked coverage configuration so this wouldn't break
- remove any references to Travis CI in the docs (i.e. readme + sphinx
  docs)

Regarding the Travis CI to GitHub Actions Coveralls transition, the
official action doesn't support the coverage files produced by coverage.py
unfornately. Also no, I don't really know what I am doing so don't @ me
if this breaks :p (well you can, but don't expect me to be THAT useful).

The Coveralls setup has two downfalls AFAIK:
- Only Linux runs are used because AndreMiras/coveralls-python-action
  only supports Linux. Although this isn't a big issue since the Travis
  Coveralls configuration only used Linux data too.
- Pull requests from an internal branch (i.e. one on psf/black) will be
  marked as a push coverage build by Coveralls since our anti-duplicate-
  workflows system runs under the push even for such cases.

3 years agoadd test configurations that don't contain python2 optional install (#2190)
KotlinIsland [Tue, 4 May 2021 08:47:22 +0000 (18:47 +1000)]
add test configurations that don't contain python2 optional install (#2190)

add test for negative scenario: formatting python2 code
tag python2 only tests

Co-authored-by: KotlinIsland <kotlinisland@users.noreply.github.com>
3 years agoDetect `'@' dotted_name '(' ')' NEWLINE` as a simple decorator (#2182)
Richard Si [Tue, 4 May 2021 08:46:46 +0000 (04:46 -0400)]
Detect `'@' dotted_name '(' ')' NEWLINE` as a simple decorator (#2182)

Previously the RELAXED_DECORATOR detection would be falsely True on that
example. The problem was that an argument-less parentheses pair didn't
pass the `is_simple_decorator_trailer` check even it should. OTOH a
parentheses pair containing an argument or more passed as expected.

3 years agoprimer: Add `--no-diff` option (#2187)
Cooper Lees [Tue, 4 May 2021 08:44:40 +0000 (01:44 -0700)]
primer: Add `--no-diff` option (#2187)

- Allow runs with no code diff output
- This is handy for reducing output to see which file is erroring

Test:
- Edit config for 'channels' to expect no changes and run with `--no-diff` and see no diff output

3 years agoprimer: Renable pandas (#2185)
Cooper Lees [Mon, 3 May 2021 21:58:17 +0000 (14:58 -0700)]
primer: Renable pandas (#2185)

- It no longer crashes black so we should test on it's code
- Update django reason to name the file causing error
  - Seems it has a syntax error on purpose

3 years agoSet `is_pyi` if `stdin_filename` ends with `.pyi` (#2169)
Bryan Forbes [Sun, 2 May 2021 12:48:54 +0000 (07:48 -0500)]
Set `is_pyi` if `stdin_filename` ends with `.pyi` (#2169)

Fixes #2167

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
3 years agoTox has been formatted with Black 21.4b0 (#2175)
Hugo van Kemenade [Sat, 1 May 2021 19:17:20 +0000 (22:17 +0300)]
Tox has been formatted with Black 21.4b0 (#2175)

3 years agoAdd ability to pass posargs to pytest run in tox.ini (#2173)
Kaleb Barrett [Sat, 1 May 2021 18:47:59 +0000 (13:47 -0500)]
Add ability to pass posargs to pytest run in tox.ini (#2173)

3 years agoElaborate on what AST changes Black might perform
Łukasz Langa [Wed, 28 Apr 2021 14:48:04 +0000 (16:48 +0200)]
Elaborate on what AST changes Black might perform

3 years agoUpdate CHANGELOG for 21.4b2 release (#2162)
Cooper Lees [Wed, 28 Apr 2021 14:21:56 +0000 (07:21 -0700)]
Update CHANGELOG for 21.4b2 release (#2162)

3 years agoRemove useless shebangs in non-executable files (#2161)
Miro Hrončok [Wed, 28 Apr 2021 14:07:15 +0000 (16:07 +0200)]
Remove useless shebangs in non-executable files (#2161)

Such shebangs are only ever used if the file is executed directly, i.e.:

    $ /usr/lib/python3.9/site-packages/black_primer/cli.py

But that doesn't work:

    $ /usr/lib/python3.9/site-packages/black_primer/cli.py
    bash: /usr/lib/python3.9/site-packages/black_primer/cli.py: Permission denied

The lib file even has: "lib is a library, funnily enough"

3 years agoAdd automatic version tagging to Docker CI Pushes (#2132)
Cooper Lees [Wed, 28 Apr 2021 03:10:44 +0000 (20:10 -0700)]
Add automatic version tagging to Docker CI Pushes (#2132)

* Add automatic version tagging to Docker Uploads
- If the git comment has a tag, set that on the docker images pushed
- If we don't have a tag, we just set `latest_non_release`

* Add trigger on release creation too

* Make prettier happy omn docker.yml

3 years agoIgnore inaccessible user config (#2158)
Jelle Zijlstra [Tue, 27 Apr 2021 21:16:35 +0000 (14:16 -0700)]
Ignore inaccessible user config (#2158)

Fixes #2157

3 years agoUpdate discussion of AST safety check in README (#2159)
Jelle Zijlstra [Tue, 27 Apr 2021 21:00:17 +0000 (14:00 -0700)]
Update discussion of AST safety check in README (#2159)

3 years agoInstall primer.json (used by black-primer by default) with black (#2154)
Miro Hrončok [Tue, 27 Apr 2021 15:58:39 +0000 (17:58 +0200)]
Install primer.json (used by black-primer by default) with black (#2154)

Fixes https://github.com/psf/black/issues/2153

3 years agoAdd pyanalyze and typeshed to black-primer (#2152)
Jelle Zijlstra [Tue, 27 Apr 2021 15:33:51 +0000 (08:33 -0700)]
Add pyanalyze and typeshed to black-primer (#2152)

pyanalyze is one of my projects and it uses `--experimental-string-processing`.

typeshed has a lot of stub files.

3 years agoUpdate CHANGELOG for 21.4b1 release (#2151)
Cooper Lees [Tue, 27 Apr 2021 14:40:08 +0000 (07:40 -0700)]
Update CHANGELOG for 21.4b1 release (#2151)

* Update CHANGELOG for 21.4b1 release

* Add pathspec minimum bump + update primer not to expect changes for virtualenv

3 years agoMaintainers += Richard Si (aka ichard26) (#2149)
Richard Si [Mon, 26 Apr 2021 20:59:45 +0000 (16:59 -0400)]
Maintainers += Richard Si (aka ichard26) (#2149)

3 years agoStop stripping parens in even more illegal spots (#2148)
Richard Si [Mon, 26 Apr 2021 20:26:43 +0000 (16:26 -0400)]
Stop stripping parens in even more illegal spots (#2148)

We're only fixing them so fuzzers don't yell at us when we break "valid"
code. I mean "valid" because some of the examples aren't even accepted by
Python.

3 years agoBump pathspec to >= 0.8.1 to solve invalid .gitignore exclusion handling (#2084)
Łukasz Langa [Mon, 26 Apr 2021 19:22:25 +0000 (21:22 +0200)]
Bump pathspec to >= 0.8.1 to solve invalid .gitignore exclusion handling (#2084)

Also made the Click requirement in Pipfile consistent with setup.py and bumped mypy.

3 years agoAdd more tests for fancy whitespace (#2147)
Łukasz Langa [Mon, 26 Apr 2021 18:24:06 +0000 (20:24 +0200)]
Add more tests for fancy whitespace (#2147)

3 years agoFix crash on docstrings ending with "\ " (#2142)
Jelle Zijlstra [Mon, 26 Apr 2021 17:42:16 +0000 (10:42 -0700)]
Fix crash on docstrings ending with "\ " (#2142)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
3 years agoSymlink docs/change_log.md to CHANGES.md, don't copy (#2146)
Richard Si [Mon, 26 Apr 2021 17:26:03 +0000 (13:26 -0400)]
Symlink docs/change_log.md to CHANGES.md, don't copy (#2146)

Super duper janky stopgap fix until I get my documentation reorganization
work done and merged

3 years agoDon't strip parens in assert / return with assign expr (#2143)
Richard Si [Mon, 26 Apr 2021 15:28:42 +0000 (11:28 -0400)]
Don't strip parens in assert / return with assign expr (#2143)

Black would previously strip the parenthesis away from statements like this these ones:

    assert (spam := 12 + 1)
    return (cheese := 1 - 12)

Which happens to be invalid code. Now before making the parenthesis invisible, Black
checks if the assignment expression's parent is an assert stamtment, aborting if True.

Raise, yield, and await are already handled fine.

I added a bunch of test cases from the PEP defining asssignment expressions (PEP 572).

3 years agofix magic comma and experimental string cache flags (#2131)
Jelle Zijlstra [Mon, 26 Apr 2021 05:46:48 +0000 (22:46 -0700)]
fix magic comma and experimental string cache flags (#2131)

* fix magic comma and experimental string cache flags

* more changelog

* Update CHANGES.md

Co-authored-by: Cooper Lees <me@cooperlees.com>
* fix tests

Co-authored-by: Cooper Lees <me@cooperlees.com>
3 years agoRemove Lowercase Hex (PR #1692) from CHANGES.md (#2133)
Cooper Lees [Mon, 26 Apr 2021 03:48:04 +0000 (20:48 -0700)]
Remove Lowercase Hex (PR #1692) from CHANGES.md (#2133)

- It was reverted to not cause so much diff churn on millions of lines of code
- Fix primer config for projects that should now pass

3 years agoUpdate CHANGES.md for release (#2129)
Cooper Lees [Sun, 25 Apr 2021 22:12:27 +0000 (15:12 -0700)]
Update CHANGES.md for release (#2129)

3 years agoIssue 1629 has been closed, let's celebrate! (#2127)
Richard Si [Sun, 25 Apr 2021 21:52:23 +0000 (17:52 -0400)]
Issue 1629 has been closed, let's celebrate! (#2127)

3 years agoDocker CI: Add missed Checkout step (#2128)
Cooper Lees [Sun, 25 Apr 2021 21:51:13 +0000 (14:51 -0700)]
Docker CI: Add missed Checkout step (#2128)

- Reading my error others hit it by forgetting this Checkoutstep too so trying the fix
  - e.g. https://github.com/docker/build-push-action/issues/179
- Makes sense it's needed

3 years agoAdd Docker Github Action (#2086)
Cooper Lees [Sun, 25 Apr 2021 18:27:35 +0000 (11:27 -0700)]
Add Docker Github Action (#2086)

* Add Docker Github Action
- Build and upload arm64 + amd64 black images on push to master

This will need a `DOCKERHUB_USERNAME` and `DOCKERHUB_TOKEN` secrets set by someone with access.

* Change tag to push to pyfound/black repository. Thanks @ewdurbin

3 years agoWork around stability errors due to optional trailing commas (#2126)
Łukasz Langa [Sun, 25 Apr 2021 18:15:54 +0000 (20:15 +0200)]
Work around stability errors due to optional trailing commas (#2126)

Optional trailing commas put by Black become magic trailing commas on another
pass of the tool.  Since they are influencing formatting around optional
parentheses, on rare occasions the tool changes its mind in terms of putting
parentheses or not.

Ideally this would never be the case but sadly the decision to put optional
parentheses or not (which looks at pre-existing "magic" trailing commas) is
happening around the same time as the decision to put an optional trailing
comma.  Untangling the two proved to be impractically difficult.

This shameful workaround uses the fact that the formatting instability
introduced by magic trailing commas is deterministic: if the optional trailing
comma becoming a pre-existing "magic" trailing comma changes formatting, the
second pass becomes stable since there is no variable factor anymore on pass 3,
4, and so on.

For most files, this will introduce no performance penalty since `--safe` is
already re-formatting everything twice to ensure formatting stability.  We're
using this result and if all's good, the behavior is equivalent.  If there is
a difference, we treat the second result as the binding one, and check its
sanity again.

3 years agoFix primer config
Łukasz Langa [Sun, 25 Apr 2021 17:44:06 +0000 (19:44 +0200)]
Fix primer config

3 years agoRe-add .venv to .gitignore
Łukasz Langa [Sun, 25 Apr 2021 17:42:02 +0000 (19:42 +0200)]
Re-add .venv to .gitignore

3 years agoRevert "Use lowercase hex numbers fixes #1692 (#1775)"
Łukasz Langa [Sun, 25 Apr 2021 17:04:15 +0000 (19:04 +0200)]
Revert "Use lowercase hex numbers fixes #1692 (#1775)"

This reverts commit 7d032fa848c8910007a0a41c1ba61d70d2846f48.

3 years agoDocument experimental string processing and docstring indentation (#2106)
Felix Hildén [Thu, 22 Apr 2021 17:37:27 +0000 (20:37 +0300)]
Document experimental string processing and docstring indentation (#2106)

3 years agoHandle Docstrings as bytes + strip all whitespace (#2037)
CiderMan [Thu, 22 Apr 2021 15:40:51 +0000 (16:40 +0100)]
Handle Docstrings as bytes + strip all whitespace (#2037)

(fixes #1844, fixes #1923, fixes #1851, fixes #2002, fixes #2103)

3 years agoMake black remove leading and trailing spaces from one-line docstrings (#1740)
Mark Bell [Thu, 22 Apr 2021 15:23:41 +0000 (16:23 +0100)]
Make black remove leading and trailing spaces from one-line docstrings (#1740)

Fixes #1738. Fixes #1812.

Previously, Black removed leading and trailing spaces in multiline docstrings but failed to remove them from one-line docstrings.

3 years agoInstructions on documenting code style modifications (#2109)
Felix Hildén [Sun, 18 Apr 2021 21:18:39 +0000 (00:18 +0300)]
Instructions on documenting code style modifications (#2109)

3 years agoFix small comment typo (#2112)
Laurent Tréguier [Fri, 16 Apr 2021 17:41:19 +0000 (19:41 +0200)]
Fix small comment typo (#2112)

We probably don't need to fall back on "polling" when setting up an asyncio loop

3 years agoAdd missing instructions to make test passed (#2100)
Pierre Verkest [Mon, 12 Apr 2021 13:18:11 +0000 (15:18 +0200)]
Add missing instructions to make test passed (#2100)

3 years agoRemove NBSP at the beginning of comments (#2092)
Pierre Sassoulas [Sun, 11 Apr 2021 21:41:22 +0000 (23:41 +0200)]
Remove NBSP at the beginning of comments (#2092)

Closes #2091

3 years agoAdded not formatting files in gitignore (psf#1682) (#1734)
Simon [Sun, 11 Apr 2021 21:00:03 +0000 (07:00 +1000)]
Added not formatting files in gitignore (psf#1682) (#1734)

3 years agofix typing issue around lru_cache arguments (#2098)
Jelle Zijlstra [Sun, 11 Apr 2021 14:49:42 +0000 (07:49 -0700)]
fix typing issue around lru_cache arguments (#2098)

This was found by python/mypy#10308

3 years agoExclude venv directory by default (#1683)
johnthagen [Sat, 10 Apr 2021 12:07:34 +0000 (08:07 -0400)]
Exclude venv directory by default (#1683)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
3 years agoFix error from upcoming typeshed change (#2096)
Jelle Zijlstra [Thu, 8 Apr 2021 17:25:37 +0000 (10:25 -0700)]
Fix error from upcoming typeshed change (#2096)

See python/typeshed#5190

3 years agoAdd `black` Dockerfile (#1916)
Cooper Lees [Thu, 8 Apr 2021 04:13:11 +0000 (21:13 -0700)]
Add `black` Dockerfile (#1916)

* Add `black` Dockerfile
- Build a `black` container based on python3-slim
- Test: `docker build --network-host --tag black .`
```console
cooper-mbp1:black cooper$ docker image ls
REPOSITORY                                         TAG            IMAGE ID       CREATED              SIZE
black                                              latest         0c7636402ac2   4 seconds ago        332MB
```

Addresses part of #1914

* Build with colorama + d extra installs - Adds ~9mb

* Combine all build commands in 1 run
- Combine the commands all into 1 RUN to down the size
- Get to 65.98 MB image size now: https://hub.docker.com/repository/docker/cooperlees/black/tags?page=1&ordering=last_updated

* Add rm -r of /var/lib/apt/lists/* + save 10mb down to 55mb

3 years agoBump urllib3 from 1.26.3 to 1.26.4 (#2090)
dependabot[bot] [Tue, 6 Apr 2021 18:07:57 +0000 (11:07 -0700)]
Bump urllib3 from 1.26.3 to 1.26.4 (#2090)

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.3 to 1.26.4.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.3...1.26.4)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years agoGet rid of redundant spaces in docs (#2085)
Jakub Warczarek [Sun, 4 Apr 2021 14:21:33 +0000 (16:21 +0200)]
Get rid of redundant spaces in docs (#2085)

Thanks!

3 years agoRun lint in latest python + update precommit (#2081)
Cooper Lees [Thu, 1 Apr 2021 23:15:50 +0000 (16:15 -0700)]
Run lint in latest python + update precommit (#2081)

- Lets move to latest and greatest of lints

3 years agoPush contributors to use Next PR Number (#2080)
Richard Si [Thu, 1 Apr 2021 21:24:18 +0000 (17:24 -0400)]
Push contributors to use Next PR Number (#2080)

This is a tool of my own making. Right now our requirement to have the
PR number in the changelog entry is pretty painful / annoying since
the contributor either has to guess or add the # retroactively after
the PR creation. This tool should make it way less painful by making
it simple to get your PR number beforehand.

3 years agoAdd CONTRBUTING info about CHANGES.md requirement (#2073)
Cooper Lees [Thu, 1 Apr 2021 16:54:45 +0000 (09:54 -0700)]
Add CONTRBUTING info about CHANGES.md requirement (#2073)

Instruct contributors to add the change line to help save maintainer / releaser time

3 years agoAdd a GitHub Action to build + Upload black to PyPI (#1848)
Cooper Lees [Thu, 1 Apr 2021 16:41:55 +0000 (09:41 -0700)]
Add a GitHub Action to build + Upload black to PyPI (#1848)

* Add a GitHub Action to build + Upload black to PyPI
- Build a wheel + sdist
- Upload via twine using token stored in GitHub secrets

3 years agoSupport for top-level user configuration (#1899)
Harish Rajagopal [Thu, 1 Apr 2021 16:39:18 +0000 (18:39 +0200)]
Support for top-level user configuration (#1899)

* Added support for top-level user configuration

At the user level, a TOML config can be specified in the following locations:
* Windows: ~\.black
* Unix-like: $XDG_CONFIG_HOME/black (~/.config/black fallback)

Instead of changing env vars for the entire black-primer process, they
are now changed only for the black subprocess, using a tmpdir.

3 years agodon't require typed-ast
KotlinIsland [Tue, 16 Mar 2021 09:31:18 +0000 (19:31 +1000)]
don't require typed-ast

3 years agoBump pygments from 2.6.1 to 2.7.4 in /docs (#2076)
dependabot[bot] [Tue, 30 Mar 2021 01:59:57 +0000 (18:59 -0700)]
Bump pygments from 2.6.1 to 2.7.4 in /docs (#2076)

Bumps [pygments](https://github.com/pygments/pygments) from 2.6.1 to 2.7.4.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](https://github.com/pygments/pygments/compare/2.6.1...2.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years agoGREP for PR reference accepts references that are split over a line (#2072)
Mark Bell [Sun, 28 Mar 2021 23:01:37 +0000 (00:01 +0100)]
GREP for PR reference accepts references that are split over a line (#2072)

Fixes #2070

3 years agoAdd `--skip-magic-trailing-comma` to CHANGES.md (#2064)
Shantanu [Fri, 26 Mar 2021 14:21:18 +0000 (07:21 -0700)]
Add `--skip-magic-trailing-comma` to CHANGES.md (#2064)

3 years agoAdd entry for `--extend-exclude` in the right place (#2061)
Richard Si [Wed, 24 Mar 2021 23:38:07 +0000 (19:38 -0400)]
Add entry for `--extend-exclude` in the right place (#2061)

The PR author added the changelog entry for their `extend-exclude` addition
in `docs/change_log.md` which is understandable but incorrect as it will be
overwritten since it's autogenerated from the readme.

3 years agoAdd a GitHub CHANGELOG/News Check (#2057)
Cooper Lees [Sun, 21 Mar 2021 20:05:24 +0000 (13:05 -0700)]
Add a GitHub CHANGELOG/News Check (#2057)

- Run grep to see commit has a line mentioning it to CHANGES.md
- Also add a label to disable this being required for PRs that don't need a change entry

3 years agoFix indentation in docs/editor_integration.md (#2056)
Richard Si [Sat, 20 Mar 2021 19:15:55 +0000 (15:15 -0400)]
Fix indentation in docs/editor_integration.md (#2056)

Numbered list entries' bodies need to be indented or else the list won't
render correctly.

3 years agoRecommend B950 + 88 char limit instead of 80 (#2050)
Jairo Llopis [Thu, 18 Mar 2021 15:14:15 +0000 (15:14 +0000)]
Recommend B950 + 88 char limit instead of 80 (#2050)

[The section about line length][1] was contradictory.

On one side, it said:

> Black will try to respect that [line length limit]. However, sometimes it won't be able to without breaking other rules. In those rare cases, auto-formatted code will exceed your allotted limit.

So black doesn't guarantee that your code is formatted at 88 chars, even when configured with `--line-length=88` (default). Black uses this limit as a "hint" more than a "rule".

OTOH, it also said:

> If you're using Flake8, you can bump max-line-length to 88 and forget about it. Alternatively, use Bugbear's B950 warning instead of E501 and keep the max line length at 80 which you are probably already using.

But that's not true. You can't "forget about it" because Black sometimes won't respect the limit. Both E501 at 88 and B950 at 80 behave the same: linter error at 89+ length. So, if Black happens to decide that a line of code is better at 90 characters that some other fancy style, you land on a unlucky situation where both tools will fight.

So, AFAICS, the best way to align flake8 and black is to:

1. Use flake8-bugbear
2. Enable B950
3. Disable E501
4. Set `max-line-length = 88`

This way, we also tell flake8 that 88 limit is a "hint" and not a "rule". The real rule will be 88 + 10%. If black decides that a line fits better in 97 characters than in 88 + some formatting, _that_ probably means your code has a real problem.

To avoid further confusion, I change the official recommendation here.

[1]: https://github.com/PyCQA/flake8-bugbear/tree/e82bb8d8b855adbf1f6f9757fb1527e93039e0d9#opinionated-warnings

3 years agoUse vim autoload script (#1157)
Konstantin Alekseev [Mon, 8 Mar 2021 00:13:25 +0000 (03:13 +0300)]
Use vim autoload script (#1157)

3 years agoAdd missing changelog entry for fmt: skip (#2025)
Richard Si [Sat, 6 Mar 2021 20:02:25 +0000 (15:02 -0500)]
Add missing changelog entry for fmt: skip (#2025)

3 years agoAdd ALE (#1753)
John Meow [Sat, 6 Mar 2021 04:22:19 +0000 (07:22 +0300)]
Add ALE (#1753)

3 years agoRemove unused import statements using Pycln. (#2021)
Hadi Alqattan [Fri, 5 Mar 2021 19:58:00 +0000 (22:58 +0300)]
Remove unused import statements using Pycln. (#2021)

* remove unused imports using Pycln.

* reverse comma style.

3 years agoBump aiohttp from 3.7.3 to 3.7.4 (#2009)
dependabot[bot] [Fri, 5 Mar 2021 18:43:54 +0000 (10:43 -0800)]
Bump aiohttp from 3.7.3 to 3.7.4 (#2009)

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.7.3 to 3.7.4.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](https://github.com/aio-libs/aiohttp/compare/v3.7.3...v3.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years agoBlack requires Python 3.6.2+ (#1668)
Hugo van Kemenade [Thu, 4 Mar 2021 13:59:31 +0000 (15:59 +0200)]
Black requires Python 3.6.2+ (#1668)

3 years agoAdd formatters-python for atom to editor_integration (#1834)
Utkarsh Gupta [Thu, 4 Mar 2021 00:46:27 +0000 (06:16 +0530)]
Add formatters-python for atom to editor_integration (#1834)

3 years agoTurn test_regex into a click callback (#2016)
Joshua Cannon [Wed, 3 Mar 2021 01:21:50 +0000 (19:21 -0600)]
Turn test_regex into a click callback (#2016)

Co-authored-by: Richard Si <63936253+ichard26@users.noreply.github.com>
3 years agoAdds --stdin-filename back to changelog (#2017)
Austin Pray [Tue, 2 Mar 2021 00:35:57 +0000 (18:35 -0600)]
Adds --stdin-filename back to changelog (#2017)

* Adds --stdin-filename back to changelog

Looks like this went missing https://github.com/psf/black/commit/dea81b7ad5cfa04c3572771c34af823449d0a8f3#diff-729efdd61772b108539268bdbfd7472521bdc05a7cae6113f62ed2649a3ad9c7

* Update CHANGES.md

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
* Update CHANGES.md

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
3 years agoAdd --extend-exclude parameter (#2005)
Joshua Cannon [Mon, 1 Mar 2021 22:07:36 +0000 (16:07 -0600)]
Add --extend-exclude parameter (#2005)

Look ma! I contribute to open source!

Co-authored-by: Richard Si <63936253+ichard26@users.noreply.github.com>
3 years agoStrip redundant parentheses from assignment exprs (#1906)
Rishav Kundu [Sun, 28 Feb 2021 01:20:23 +0000 (06:50 +0530)]
Strip redundant parentheses from assignment exprs (#1906)

Fixes #1656

3 years agoWrap arithmetic and binary arithmetic expressions in invisible parentheses (#2001)
tpilewicz [Wed, 24 Feb 2021 11:56:56 +0000 (12:56 +0100)]
Wrap arithmetic and binary arithmetic expressions in invisible parentheses (#2001)

3 years agoFuzzer testing: less strict special-case regex match passthrough for multi-line EOF...
James Addison [Mon, 22 Feb 2021 15:49:38 +0000 (15:49 +0000)]
Fuzzer testing: less strict special-case regex match passthrough for multi-line EOF exceptions (#1998)

3 years agoFixup: update function name in docs to match source (#1997)
James Addison [Mon, 22 Feb 2021 15:46:38 +0000 (15:46 +0000)]
Fixup: update function name in docs to match source (#1997)

3 years agoFix for enum changes in 3.10 (#1999)
James [Mon, 22 Feb 2021 15:42:05 +0000 (15:42 +0000)]
Fix for enum changes in 3.10 (#1999)

3 years agoIndicate that a final newline was added in --diff (#1897) (#1897)
Paul "TBBle" Hampson [Mon, 22 Feb 2021 06:43:23 +0000 (17:43 +1100)]
Indicate that a final newline was added in --diff (#1897) (#1897)

Fixes: #1662
Work-around for https://bugs.python.org/issue2142

The test has to slightly mess with its input data, because the utility
functions default to ensuring the test data has a final newline, which
defeats the point of the test.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
3 years agoMinimize changes: more closely resemble original conditional logic
James Addison [Wed, 10 Feb 2021 12:33:50 +0000 (12:33 +0000)]
Minimize changes: more closely resemble original conditional logic

3 years agoReadability: reduce boolean nesting
James Addison [Tue, 9 Feb 2021 21:13:57 +0000 (21:13 +0000)]
Readability: reduce boolean nesting

3 years agoCleanup: remove unused / redundant variables from conditionals
James Addison [Thu, 4 Feb 2021 18:07:43 +0000 (18:07 +0000)]
Cleanup: remove unused / redundant variables from conditionals

3 years agoSimplification: only yield empty omit list when magic trailing comma is present
James Addison [Thu, 4 Feb 2021 17:48:38 +0000 (17:48 +0000)]
Simplification: only yield empty omit list when magic trailing comma is present

3 years agoSimplification: only use special-case token retrieval logic when magic trailing comma...
James Addison [Thu, 4 Feb 2021 17:45:45 +0000 (17:45 +0000)]
Simplification: only use special-case token retrieval logic when magic trailing comma is present

3 years agoClarity: special case: avoid using variables that have the same names as methods
James Addison [Thu, 4 Feb 2021 17:40:42 +0000 (17:40 +0000)]
Clarity: special case: avoid using variables that have the same names as methods

3 years agoConsistency: use variable names that correspond to the methods they invoke
James Addison [Thu, 4 Feb 2021 17:38:55 +0000 (17:38 +0000)]
Consistency: use variable names that correspond to the methods they invoke

3 years agoBrevity: only use the variables required to convey the intended expressions
James Addison [Thu, 4 Feb 2021 17:37:25 +0000 (17:37 +0000)]
Brevity: only use the variables required to convey the intended expressions

3 years agoClarity: isolate and extract each responsibility from an overloaded variable
James Addison [Thu, 4 Feb 2021 17:30:05 +0000 (17:30 +0000)]
Clarity: isolate and extract each responsibility from an overloaded variable

3 years agoBrevity: rename method
James Addison [Thu, 4 Feb 2021 17:26:29 +0000 (17:26 +0000)]
Brevity: rename method

3 years agofuzzer: add special-case for multi-line EOF TokenError (#1991)
James Addison [Sat, 20 Feb 2021 16:44:48 +0000 (16:44 +0000)]
fuzzer: add special-case for multi-line EOF TokenError (#1991)

* Add special-case for multi-line EOF TokenError under Python3.7

* Update conditional check to correspond to original issue description (and include issue hyperlink)

* Add warning and hint regarding replaying the fuzzer code generation

* Include code review suggestion (with modifications for this to follow)

Co-authored-by: Zac Hatfield-Dodds <zac.hatfield.dodds@gmail.com>
* Remove Python version check, since this issue does exist across more recent Python versions than 3.7

* Update explanatory comment

* Add clarification for potentially-ambiguous blib2to3 import

* Update explanatory comment

* Bring comment into consistent format with previous comment

* Revert "Add clarification for potentially-ambiguous blib2to3 import"

This reverts commit 357b7cc03bdb19dd924f1accd428352f4bb44e5c.

Co-authored-by: Zac Hatfield-Dodds <zac.hatfield.dodds@gmail.com>
3 years agoUse 'args' to Avoid GH workflow warning (#1990)
Romain Rigaux [Tue, 16 Feb 2021 21:10:23 +0000 (13:10 -0800)]
Use 'args' to Avoid GH workflow warning (#1990)

Unexpected input(s) 'black_args', valid inputs are ['entryPoint', 'args']

3 years agoadd gedit integration (#1988)
Archit Gopal [Mon, 15 Feb 2021 16:05:23 +0000 (21:35 +0530)]
add gedit integration (#1988)

3 years agoAdd "# fmt: skip" directive to black (#1800)
Sagi Shadur [Mon, 15 Feb 2021 16:02:48 +0000 (18:02 +0200)]
Add "# fmt: skip" directive to black (#1800)

Fixes #1162

3 years agoreadme: Include Zulip in used-by section (#1987)
rht [Sun, 14 Feb 2021 15:32:29 +0000 (10:32 -0500)]
readme: Include Zulip in used-by section (#1987)

Zulip has recently formatted their code in Black and also set Black as a linter: https://github.com/zulip/zulip/pull/15662.
See also https://chat.zulip.org/#narrow/stream/2-general/topic/black.

3 years agoFix duplication of checks on internal PRs (#1986)
Richard Si [Sun, 14 Feb 2021 15:23:47 +0000 (10:23 -0500)]
Fix duplication of checks on internal PRs (#1986)

Internal PRs (that come from branches of psf/black) match both the push
and pull_request events. This leads to a duplication of test, lint, etc.
checks on such PRs. Not only is it a waste of resources, it makes the
Status Checks UI more frustrating to go through.

Patch taken from:
https://github.community/t/duplicate-checks-on-push-and-pull-request-simultaneous-event/18012

3 years agoStability fixup: interaction between newlines and comments (#1975)
James Addison [Thu, 11 Feb 2021 20:11:42 +0000 (20:11 +0000)]
Stability fixup: interaction between newlines and comments (#1975)

* Add test case to illustrate the issue

* Accept carriage returns as valid separators while enumerating comments

Without this acceptance, escaped multi-line statments that use carriage returns will not be counted into the 'ignored_lines' variable since the emitted line values will end with a CR and not an escape character.  That leads to comments associated with the line being incorrectly labeled with the STANDALONE_COMMENT type, affecting comment placement and line space management.

* Remove comment linking to ephemeral build log

3 years agoBump cryptography from 3.3.1 to 3.3.2 (#1981)
dependabot[bot] [Wed, 10 Feb 2021 02:17:23 +0000 (18:17 -0800)]
Bump cryptography from 3.3.1 to 3.3.2 (#1981)

Bumps [cryptography](https://github.com/pyca/cryptography) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/3.3.1...3.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years agoRegenerate documentation (#1980)
James Addison [Wed, 10 Feb 2021 01:10:02 +0000 (01:10 +0000)]
Regenerate documentation (#1980)

Resolves #1979 and ensures that the content from #1861 is included in the repository-published documentation.

3 years agoUpdate prettier in pre-commit config (#1966)
Richard Si [Fri, 5 Feb 2021 04:10:45 +0000 (23:10 -0500)]
Update prettier in pre-commit config (#1966)

With older versions of prettier, when the hook failed a bunch of
"[error] No parser could be inferred for file: {PATH}" error lines
showed up because of lack of support of a flag that pre-commit
passes for us by default. It made figuring out why the prettier hook
failed annoying.

3 years agospeed up cache by approximately 42x by avoiding pathlib (#1953)
Anthony Sottile [Thu, 4 Feb 2021 21:03:42 +0000 (13:03 -0800)]
speed up cache by approximately 42x by avoiding pathlib (#1953)

3 years agoBump bleach from 3.2.1 to 3.3.0 (#1957)
dependabot[bot] [Tue, 2 Feb 2021 23:54:14 +0000 (15:54 -0800)]
Bump bleach from 3.2.1 to 3.3.0 (#1957)

Bumps [bleach](https://github.com/mozilla/bleach) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>