Merge from 3.x: PR #7650

spyder-ide · Aug 8, 2018 · 185cb4c · 185cb4c
2 parents 678cedc + bab6921
commit 185cb4c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -238,11 +238,13 @@ def run(self):
     'pyzmq',
     'chardet>=2.0.0',
     'numpydoc',
-    'keyring',
+    'spyder-kernels>=1.0',
+    # Don't require keyring for Python 2 and Linux
+    # because it depends on system packages
+    'keyring;sys_platform!="linux2"',
     # Packages for pyqt5 are only available in
     # Python 3
-    'pyqt5<5.10;python_version>="3"',
-    'spyder-kernels>=1.0'
+    'pyqt5<5.10;python_version>="3"'
 ]
 
 extras_require = {