Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
TomFryers committed May 5, 2022
2 parents 54976a3 + c940f75 commit 2360449
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
pull_request:
types: [opened, synchronize, labeled, unlabeled, reopened]

permissions:
contents: read

jobs:
build:
name: Changelog Entry Check
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Documentation Build

on: [push, pull_request]

permissions:
contents: read

jobs:
build:
# We want to run on external PRs, but not on our own internal PRs as they'll be run
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
release:
types: [published]

permissions:
contents: read

jobs:
docker:
if: github.repository == 'psf/black'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Fuzz

on: [push, pull_request]

permissions:
contents: read

jobs:
build:
# We want to run on external PRs, but not on our own internal PRs as they'll be run
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/pypi_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
release:
types: [published]

permissions:
contents: read

jobs:
build:
name: PyPI Upload
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/upload_binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@ on:
release:
types: [published]

permissions:
contents: read

jobs:
build:
permissions:
contents: write # for actions/upload-release-asset to upload release asset
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/uvloop_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
- "docs/**"
- "*.md"

permissions:
contents: read

jobs:
build:
# We want to run on external PRs, but not on our own internal PRs as they'll be run
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@

<!-- Changes that improve Black's performance. -->

### Vim Plugin

- Fixed strtobool function. It didn't parse true/on/false/off. (#3025)

## 22.3.0

### Preview style
Expand Down
4 changes: 2 additions & 2 deletions autoload/black.vim
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import sys
import vim

def strtobool(text):
if text.lower() in ['y', 'yes', 't', 'true' 'on', '1']:
if text.lower() in ['y', 'yes', 't', 'true', 'on', '1']:
return True
if text.lower() in ['n', 'no', 'f', 'false' 'off', '0']:
if text.lower() in ['n', 'no', 'f', 'false', 'off', '0']:
return False
raise ValueError(f"{text} is not convertable to boolean")

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Used by ReadTheDocs; pinned requirements for stability.

myst-parser==0.16.1
myst-parser==0.17.2
Sphinx==4.5.0
sphinxcontrib-programoutput==0.17
sphinx_copybutton==0.5.0
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ skip_install = True
deps =
-r{toxinidir}/test_requirements.txt
hypothesmith
lark-parser < 0.10.0
; lark-parser's version is set due to a bug in hypothesis. Once it solved, that would be fixed.
lark-parser
commands =
pip install -e .[d]
coverage erase
Expand Down

0 comments on commit 2360449

Please sign in to comment.