Merge remote-tracking branch 'upstream/master'

.copyrite_aliases

@@ -24,7 +24,7 @@
         "afayolle.ml@free.fr",
         "aurelien.campeas@logilab.fr",
         "lmedioni@logilab.fr"
-        
+
     ],
     "authoritative_mail": "contact@logilab.fr",
     "name": "LOGILAB S.A. (Paris, FRANCE)"
@@ -45,7 +45,7 @@
        "balparda@google.com",
        "dlindquist@google.com"
     ],
-    "name": "Google, Inc." 
+    "name": "Google, Inc."
   },
   {
    "mails": [

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -26,4 +26,3 @@ about: Report a bug in pylint
 
 
 ### pylint --version output
-

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -19,4 +19,4 @@ A clear and concise description of what you want to happen.
 
 
 ### Additional context
-Add any other context about the feature request here.
+Add any other context about the feature request here.

.github/ISSUE_TEMPLATE/3_Question.md

@@ -1,6 +1,6 @@
 ---
 name: Support question
-about: Questions about pylint that are not covered in the documentation (http://pylint.pycqa.org/en/latest/)
+about: Questions about pylint that are not covered in the documentation (https://pylint.pycqa.org/en/latest/)
 
 ---
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -29,9 +29,9 @@ https://github.com/PyCQA/pylint/blob/master/doc/development_guide/contribute.rst
 
 ## Related Issue
 
-<!-- 
+<!--
 If this PR fixes a particular issue, use the following to automatically close that issue
 once this PR gets merged:
 
-Closes #XXX 
+Closes #XXX
 -->

.isort.cfg

@@ -1,7 +1,7 @@
 [settings]
 multi_line_output=3
 line_length=88
-known_third_party=astroid, sphinx, isort, pytest, mccabe, six,
+known_third_party=astroid, sphinx, isort, pytest, mccabe, six, toml
 include_trailing_comma=True
-skip_glob=tests/functional/**,tests/input/**,tests/extensions/data/**,tests/regrtest_data/**,tests/data/**
+skip_glob=tests/functional/**,tests/input/**,tests/extensions/data/**,tests/regrtest_data/**,tests/data/**,astroid/**,venv/**
 project=pylint

.pre-commit-hooks.yaml

@@ -2,6 +2,5 @@
     name: pylint
     entry: pylint
     language: python
-    'types': [python]
-    args: []
-    additional_dependencies: []
+    types: [python]
+    require_serial: true

CONTRIBUTORS.txt

@@ -352,3 +352,46 @@ contributors:
 * Bastien Vallet: contributor
 
 * Pek Chhan: contributor
+
+* Craig Henriques: contributor
+
+* Matthijs Blom: contributor
+
+* Andy Palmer: contributor
+
+* Wes Turner (Google): added new check 'inconsistent-quotes'
+
+* Athos Ribeiro
+    Fixed dict-keys-not-iterating false positive for inverse containment checks
+
+* Anubhav: contributor
+
+* Ben Graham: contributor
+
+* Anthony Tan: contributor
+
+* Benny Müller: contributor
+
+* Bernie Gray: contributor
+
+* Slavfox: contributor
+
+* Matthew Beckers (mattlbeck): contributor
+
+* Yang Yang: contributor
+
+* Andrew J. Simmons (anjsimmo): contributor
+
+* Damien Baty: contributor
+
+* Daniel R. Neal (danrneal): contributer
+
+* Jeremy Fleischman (jfly): contributer
+
+* Shiv Venkatasubrahmanyam
+
+* Jochen Preusche (iilei): contributor
+
+* Ram Rachum (cool-RR)
+
+* Pieter Engelbrecht

COPYING

@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest