Merge branch 'develop' to get fix for py2 installs including docs gen…

…eration
landscapeio · Nov 22, 2018 · 1876090 · 1876090
2 parents a7f56d1 + b6f4d74
commit 1876090
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -19,7 +19,6 @@
 
 _INSTALL_REQUIRES = [
     'pylint-plugin-utils>=0.2.6',
-    'pylint-django==2.0.2',
     'pylint-celery==0.3',
     'pylint-flask==0.5',
     'requirements-detector>=0.6',
@@ -34,9 +33,9 @@
 ]
 
 if sys.version_info < (3, 0):
-    _INSTALL_REQUIRES += ['pylint<2']
+    _INSTALL_REQUIRES += ['pylint<2', 'pylint-django<0.9']
 else:
-    _INSTALL_REQUIRES += ['pylint>=2']
+    _INSTALL_REQUIRES += ['pylint>=2', 'pylint-django==2.0.2']
 
 _PACKAGE_DATA = {
     'prospector': [