Update install requirements and add quote stripping for environment v…

…ariables
NDCMS · Nov 22, 2017 · a103623 · a103623
1 parent d83f154
commit a103623
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lobster/core/source.py b/lobster/core/source.py
@@ -129,7 +129,7 @@ def __init__(self, config):
         for l in lines:
             m = re.match('\s*CVMFS_HTTP_PROXY\s*=\s*[\'"]?(.*)[\'"]?', l)
             if m:
-                self.__cvmfs_proxy = m.group(1)
+                self.__cvmfs_proxy = m.group(1).strip("\"'")
                 break
         else:
             try:

diff --git a/setup.py b/setup.py
@@ -38,8 +38,8 @@
     ]},
     install_requires=[
         'argparse',
-        'elasticsearch',
-        'elasticsearch_dsl',
+        'elasticsearch>=5.0.0,<6.0.0',
+        'elasticsearch_dsl>=5.0.0,<6.0.0',
         'httplib2',  # actually a WMCore dependency
         'jinja2',
         'matplotlib',