Make monitoring install by default

Parsl · May 31, 2019 · 83f8eb688ea457e5bb3a5b2e21f6db87cdd5b01d · 83f8eb6
1 parent b138ee2
commit 83f8eb688ea457e5bb3a5b2e21f6db87cdd5b01d
Unified Split

Showing with 10 additions and 12 deletions.

+10 −1 requirements.txt

+0 −11 setup.py
diff --git a/requirements.txt b/requirements.txt
@@ -7,4 +7,13 @@ tblib
 ipykernel
 requests
 paramiko
-  
-psutil
+  
+psutil
+  
+sqlalchemy
+  
+sqlalchemy_utils
+  
+pydot
+  
+networkx
+  
+Flask
+  
+flask_sqlalchemy
+  
+pandas
+  
+plotly
+  
+python-daemon
diff --git a/setup.py b/setup.py
@@ -7,17 +7,6 @@
    install_requires = f.readlines()
 extras_require = {
-  
-    'monitoring' : [
-  
-        'sqlalchemy',
-  
-        'sqlalchemy_utils',
-  
-        'pydot',
-  
-        'networkx',
-  
-        'Flask',
-  
-        'flask_sqlalchemy',
-  
-        'pandas',
-  
-        'plotly',
-  
-        'python-daemon'
-  
-    ],
    'aws' : ['boto3'],
    'kubernetes' : ['kubernetes'],
    'oauth_ssh' : ['oauth-ssh>=0.9'],