Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	CHANGELOG.md
#	prospector/__pkginfo__.py

.travis.yml

@@ -1,12 +1,14 @@
-language: python
-# http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
+dist: xenial  # required for Python >= 3.7
 language: python
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
-  - "3.7-dev"
+  - "3.7"
+  - "nightly"
+matrix:
+  allow_failures:
+    - python: "nightly"
 install:
   - "pip install --editable .[build_tools]"
 script:

CHANGELOG.md

@@ -1,5 +1,10 @@
 Prospector Changelog
 =======
+
+## Version 1.1.6.4
+- [#333](https://github.com/PyCQA/prospector/pull/333) Hotfix for pylint module run
+- [#309](https://github.com/PyCQA/prospector/pull/309) Remove the pylint locally-enabled message suppression
+
 ## Version 1.1.6.2
 - [#304](https://github.com/PyCQA/prospector/pull/304) Pin pylint to 2.1.1 for now as prospector is not compatible with 2.2.0
 - [#302](https://github.com/PyCQA/prospector/issues/302) Pin astroid to 2.0.4 as pylint-django and pylint-flask need fixes to be compatible with newer versions 

prospector/tools/pep8/__init__.py

@@ -82,10 +82,11 @@ def excluded(self, filename, parent=None):
 
         # If the file survived pep8's exclusion rules, check it against
         # prospector's patterns.
-        if os.path.isdir(os.path.join(self._files.rootpath, filename)):
+        fullpath = os.path.join(self._files.rootpath, parent or '', filename)
+        if os.path.isdir(fullpath):
             return False
 
-        fullpath = os.path.join(self._files.rootpath, parent, filename) if parent else filename
+        fullpath = fullpath if parent else filename
         return fullpath not in self._module_paths
 
 

prospector/tools/pylint/__init__.py

@@ -73,8 +73,6 @@ def _prospector_configure(self, prospector_config, linter):
         # was disabled.
         linter.disable(
             'locally-disabled')  # notification about disabling a message
-        linter.disable(
-            'locally-enabled')  # notification about enabling a message
         linter.enable(
             'file-ignored')  # notification about disabling an entire file
         linter.enable('suppressed-message'

setup.py

@@ -20,7 +20,7 @@
 _INSTALL_REQUIRES = [
     'pylint-plugin-utils>=0.2.6',
     'pylint-celery==0.3',
-    'pylint-flask==0.5',
+    'pylint-flask==0.6',
     'requirements-detector>=0.6',
     'setoptconf>=0.2.0',
     'dodgy>=0.1.9',
@@ -35,7 +35,7 @@
 if sys.version_info < (3, 0):
     _INSTALL_REQUIRES += ['pylint<2', 'pylint-django<0.9']
 else:
-    _INSTALL_REQUIRES += ['pylint==2.1.1', 'pylint-django==2.0.2', 'astroid==2.0.4']
+    _INSTALL_REQUIRES += ['pylint==2.3.1', 'pylint-django==2.0.9']
 
 _PACKAGE_DATA = {
     'prospector': [