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.

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

Remove py2 from isort #19

Merged
merged 13 commits into from
Jan 22, 2019
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To install::
Setup
-----

The release proces automatically handles updating the changelog and incrementing
The release process automatically handles updating the changelog and incrementing
a version in setup.cfg. You'll need a few extra piece to make this work in each
repository: a version to manipulate and information on the repo for changelog
automation.
Expand Down
2 changes: 1 addition & 1 deletion isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ force_alphabetical_sort=False

default_section=THIRDPARTY
known_first_party=readthedocs,readthedocsinc
known_third_party=mock,builtins
sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
remove_imports=from __future__ import division, from __future__ import print_function, from __future__ import unicode_literals, from __future__ import absolute_import, from builtins import str, from builtins import object, from builtins import next, from builtins import range, from builtins import open, import six
24 changes: 13 additions & 11 deletions pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
exclude: 'migrations|settings|scripts|tests'
exclude: '^$|settings|scripts'
fail_fast: false
repos:

- repo: https://github.com/asottile/add-trailing-comma
rev: v0.7.0
hooks:
- id: add-trailing-comma
# - repo: https://github.com/asottile/add-trailing-comma
# rev: v0.7.1
# hooks:
# - id: add-trailing-comma

- repo: git@github.com:humitos/mirrors-autoflake.git
rev: v1.1
Expand All @@ -17,7 +17,7 @@ repos:
rev: v0.25.0
hooks:
- id: yapf
additional_dependencies: ['futures']
exclude: 'migrations|tests'
args: ['--style=.style.yapf', '--parallel', '--in-place']

# When calling `pre-commit autoupdate`, this repo needs to be commented because it fails
Expand All @@ -26,22 +26,25 @@ repos:
hooks:
- id: python-import-sorter
args: ['--silent-overwrite']
exclude: 'wsgi.py'

- repo: git@github.com:humitos/mirrors-docformatter.git
rev: v1.0
- repo: git@github.com:myint/docformatter.git
# Latest release v1.0 does not contains the .pre-commit-hooks.yaml file
rev: 7cb0c50b674680e28cae8c4c1add6b43ed2ccb91
hooks:
- id: docformatter
args: ['--in-place', '--wrap-summaries=80', '--wrap-descriptions=80', '--pre-summary-newline']

- repo: git@github.com:pre-commit/pre-commit-hooks
rev: v1.4.0
rev: v2.1.0
hooks:
# Disabled because yapf is better for our purpose
# - id: autopep8-wrapper
- id: check-added-large-files
- id: debug-statements
- id: double-quote-string-fixer
- id: end-of-file-fixer
exclude: 'static'
- id: fix-encoding-pragma
- id: check-merge-conflict
- id: check-symlinks
Expand All @@ -67,10 +70,9 @@ repos:
# 'flake8-debugger',
# 'flake8-todo',
]
exclude: 'test_oauth.py'

- repo: git://github.com/guykisel/prospector-mirror
rev: b27f281eb9398fc8504415d7fbdabf119ea8c5e1
rev: 7ff847e779347033ebbd9e3b88279e7f3a998b45
hooks:
- id: prospector
# https://github.com/pre-commit/pre-commit/issues/178
Expand Down
9 changes: 5 additions & 4 deletions prospector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ pep257:
- D100 # Missing docstring in public module
- D101 # Missing docstring in public class
- D102 # Missing docstring in public method

- D104
- D105
- D106 # Missing docstring in public nested class
- D107 # Missing docstring in __init__

- D202 # No blank lines allowed after function docstring (found 1)
- D211
- D104
- D212 # Multi-line docstring summary should start at the first line
- D107 # Missing docstring in __init__
- D106 # Missing docstring in public nested class

# pydocstyle
- D403 # First word of the first line should be properly capitalized ('Github', not 'GitHub')
Expand Down