Merge branch 'master' of github.com:DLHub-Argonne/dlhub_sdk

DLHub-Argonne · Aug 24, 2020 · 49021a4 · 49021a4
2 parents 55a7499 + d3bbf14
commit 49021a4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/dlhub_sdk/client.py b/dlhub_sdk/client.py
@@ -69,21 +69,24 @@ def __init__(self, dlh_authorizer=None, search_client=None, http_timeout=None,
 
             fx_scope = "https://auth.globus.org/scopes/facd7ccc-c5f4-42aa-916b-a0e270e2c2a9/all"
             auth_res = login(services=["search", "dlhub",
-                                       fx_scope],
+                                       fx_scope, "openid"],
                              app_name="DLHub_Client",
                              client_id=CLIENT_ID,
                              clear_old_tokens=force_login,
                              token_dir=_token_dir,
                              no_local_server=kwargs.get("no_local_server", True),
                              no_browser=kwargs.get("no_browser", True))
+            # openid_authorizer = auth_res["openid"]
             dlh_authorizer = auth_res["dlhub"]
             fx_authorizer = auth_res[fx_scope]
             self._search_client = auth_res["search"]
-            self._fx_client = FuncXClient(force_login=True,
-                                          fx_authorizer=fx_authorizer,
-                                          no_local_server=kwargs.get("no_local_server", True),
-                                          no_browser=kwargs.get("no_browser", True),
-                                          funcx_service_address='https://funcx.org/api/v1')
+
+        self._fx_client = FuncXClient(force_login=force_login,
+                                      # fx_authorizer=fx_authorizer,
+                                      no_local_server=kwargs.get("no_local_server", True),
+                                      no_browser=kwargs.get("no_browser", True),
+                                      funcx_service_address='https://api.funcx.org/v1',)
+                                      # openid_authorizer=openid_authorizer)
 
         # funcX endpoint to use
         self.fx_endpoint = '86a47061-f3d9-44f0-90dc-56ddc642c000'
@@ -454,4 +457,4 @@ def clear_funcx_cache(self, servable=None):
         else:
             self.fx_cache = {}
 
-        return self.fx_cache
+        return self.fx_cache
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 globus-sdk>=1.7.0
 jsonpickle>=1.0
 requests>=2.20.0
-mdf_toolbox>=0.4.0
+mdf_toolbox>=0.5.0
 jsonschema>=3.0.0
-funcx>=0.0.1a5
+funcx>=0.0.2a0
diff --git a/setup.py b/setup.py
@@ -19,12 +19,12 @@
                       "that other scientists have published."),
     install_requires=[
         "pandas",
-        "requests==2.20.0",
+        "requests>=2.20.0",
         "jsonschema>=3.0.0",
         "globus_sdk",
         "jsonpickle",
         "mdf_toolbox>=0.4.0",
-        "funcx>=0.0.1a5"
+        "funcx>=0.0.2a0"
     ],
     python_requires=">=3.4",
     classifiers=[