Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dev dependencies #386

Merged
merged 2 commits into from Dec 4, 2020
Merged

Update dev dependencies #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14dc375
black@20.8b1
jaswilli Dec 4, 2020
b47806f
Update dev dependencies
jaswilli Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions .pre-commit-config.yaml
View file
Open in desktop
Expand Up @@ -5,25 +5,22 @@ repos:
- id: check-merge-conflict
- id: trailing-whitespace
- repo: https://github.com/python/black
# refrain from using 19.10b0 or later until
# https://github.com/psf/black/issues/1288
# is fixed
rev: 19.3b0
rev: 20.8b1
Copy link
Contributor Author

@jaswilli jaswilli Dec 4, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

psf/black#1288 was resolved in the 20.8b0 release

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It took a long time but I've been happy with the behavior in the >=20.8b0 versions.
We should check CLI for this as well. I bet it's still on 19.3b0

hooks:
- id: black
name: "Autoformat python files"
types: [python]
language_version: python3
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.3
rev: 3.8.4
hooks:
- id: flake8
name: "Lint python files"
types: [python]
language_version: python3
additional_dependencies: ['flake8-bugbear==20.1.4']
additional_dependencies: ['flake8-bugbear==20.11.1']
- repo: https://github.com/timothycrosley/isort
rev: 5.1.4
rev: 5.6.4
hooks:
- id: isort
name: "Sort python imports"
Expand Down
10 changes: 3 additions & 7 deletions setup.py
View file
Open in desktop
Expand Up @@ -49,14 +49,10 @@
"tox>=3.5.3,<4.0",
# linting
"flake8>=3.0,<4.0",
'isort>=5.1.4,<6.0;python_version>="3.6"',
# black requires py3.6+
# refrain from using 19.10b0 or later until
# https://github.com/psf/black/issues/1288
# is fixed
'black==19.3b0;python_version>="3.6"',
'isort>=5.6.4,<6.0;python_version>="3.6"',
'black==20.8b1;python_version>="3.6"',
# flake-bugbear requires py3.6+
'flake8-bugbear==20.1.4;python_version>="3.6"',
'flake8-bugbear==20.11.1;python_version>="3.6"',
# testing
"pytest<5.0",
"pytest-cov<3.0",
Expand Down