Merge 33652f7 into a9a993a

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+ignore = E126
+max-line-length = 120
+exclude = */migrations/*,docs/*

.gitignore

@@ -52,9 +52,12 @@ TAGS
 flycheck*
 
 # local configuration
+.python-version
 .env
 .venv
 venv
 
 # Pylint
 .pylint.d
+
+pip-wheel-metadata

.pre-commit-config.yaml

@@ -1,19 +1,24 @@
 fail_fast: true
 repos:
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v1.2.3
+    rev: v3.1.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: debug-statements
     -   id: fix-encoding-pragma
-    -   id: flake8
-        args:
-        - --max-line-length=160
-        - --exclude=*/migrations/*,docs/*
-        - --ignore=E126
     -   id: check-added-large-files
--   repo: git://github.com/FalconSocial/pre-commit-python-sorter
-    rev: b57843b0b874df1d16eb0bef00b868792cb245c2
+-   repo: https://github.com/psf/black
+    rev: 19.10b0
+    hooks:
+    -   id: black
+        args:
+            - --exclude=/(tests)/
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.2
     hooks:
-    -   id: python-import-sorter
+    -   id: flake8
+        additional_dependencies:
+        - flake8-black
+        args:
+            - --ignore=E203,E231,W503

.travis.yml

@@ -1,7 +1,6 @@
 dist: xenial  # required for Python >= 3.7
 language: python
 python:
-  - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"
@@ -12,6 +11,8 @@ matrix:
     - python: "nightly"
 install:
   - "pip install --editable .[with_everything]"
+  - "pip install safety"
+  - "pip freeze | safety check --stdin"
 script:
   - "nosetests -s --with-coverage --cover-inclusive --cover-package=prospector tests/"
   - "mv .coverage .coverage.x"

CHANGELOG.md

@@ -1,6 +1,21 @@
 Prospector Changelog
 =======
 
+## Version 1.3.0
+- Update pylint support to 2.5.2
+- Update pylint-django to 2.0.15
+- Update pyflakes support to 2.2.0
+- Update pycodestyle support to 2.6.0
+- Update pep8-naming support to 0.10.0
+- Update pyflakes to <2.3.0 and >=2.2.0
+- Update pycodestyle to <2.7.0 and >=2.6.0
+- Update vulture to 1.5
+- Drop Python 2 support
+- [#378](https://github.com/PyCQA/prospector/pull/378) Add output-target field when merging profiles
+- [#369](https://github.com/PyCQA/prospector/pull/369) Add support for [pycodestyle] external config section
+- Fix AttributeExceptionError being raised when ignore_paths is an integer
+- Use black on entire project
+
 ## Version 1.2.0
 - Drop Python 3.4 support
 - [#308](https://github.com/PyCQA/prospector/pull/308) Update pyflakes support to < 2.1.0
@@ -10,6 +25,7 @@ Prospector Changelog
 - [#356](https://github.com/PyCQA/prospector/pull/356) Add support for Python 3.8
 
 ## Version 1.1.7
+
 - [#299](https://github.com/PyCQA/prospector/pull/299) Output path tests and abspaths for windows
 - [#300](https://github.com/PyCQA/prospector/pull/300) Fix `check_paths` definition for pep8tool
 - [#318](https://github.com/PyCQA/prospector/pull/318) Add support pylint --load-plugins option in profile

CONTRIBUTORS.md

@@ -8,6 +8,7 @@ Contributors
 * Bryce Guinta ([@brycepg](https://github.com/brycepg))
 * Carl Crowder ([@carlio](https://github.com/carlio))
 * Carlos Coêlho ([@chocoelho](https://github.com/chocoelho))
+* Carlos Cruz ([@ccruz09](https://github.com/ccruz09))
 * Claudiu Popa ([@PCManticore](https://github.com/PCManticore))
 * David J Pugh ([@djpugh](https://github.com/djpugh))
 * Eric Brown ([@ericwb](https://github.com/ericwb))
@@ -19,6 +20,7 @@ Contributors
 * Jon Parise ([@jparise](https://github.com/jparise))
 * Kristian Glass ([@doismellburning](https://github.com/doismellburning))
 * Luke Hinds ([@lukehinds](https://github.com/lukehinds))
+* Matt Seymour ([@mattseymour](https://github.com/mattseymour))
 * Phil Frost ([@bitglue](https://github.com/bitglue))
 * Phil Jones ([@pgjones](https://github.com/pgjones))
 * SergeyKosarchuk ([@SergeyKosarchuk](https://github.com/SergeyKosarchuk))

LICENSE

@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     Pylint plugin for improving code analysis for when using Django
-    Copyright (C) 2013  
+    Copyright (C) 2013
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by