Skip to content

Commit 7ed23cd

Browse files
committed
ci: upgrade Black to v20.8b1, drop Python 2.7/3.5, and disable check
Summary: See #4406. Subsequent commits will re-run Black with the new settings and new version (these commits will be ignored for blame purposes), and then another commit will re-enable enforcement. wchargin-branch: black-20x-no27-no35
1 parent c7a4c73 commit 7ed23cd

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# flake8 should run on each Python version that we target,
3434
# because the errors and warnings can differ due to language
3535
# changes, and we want to catch them all.
36-
python_version: ['3.5', '3.7']
36+
python_version: ['3.6', '3.7']
3737
steps:
3838
- uses: actions/checkout@v1
3939
- uses: actions/setup-python@v1
@@ -65,7 +65,8 @@ jobs:
6565
- run: pip freeze --all
6666
- name: 'Lint Python code for style with Black'
6767
# You can run `black .` to fix all Black complaints.
68-
run: black --check --diff .
68+
# TODO(#4406): Re-enable this check.
69+
run: black --check --diff . || true
6970

7071
lint-rust:
7172
runs-on: ubuntu-16.04

pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
[tool.black]
22
line-length = 80
3-
# TODO(@wchargin): Drop `py35` here once we drop support for Python 3.5
4-
# and aren't affected by <https://bugs.python.org/issue9232>.
5-
target-version = ["py27", "py35", "py36", "py37", "py38"]
3+
target-version = ["py36", "py37", "py38"]

tensorboard/pip_package/requirements_dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ boto3==1.9.86
2323
moto==1.3.7
2424

2525
# For linting
26-
black==19.10b0; python_version >= "3.6"
26+
black==20.8b1; python_version >= "3.6"
2727
flake8==3.7.8
2828
yamllint==1.17.0
2929

0 commit comments

Comments
 (0)