diff --git a/.travis.yml b/.travis.yml index 3e565a0..94872f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,7 @@ before_install: - openssl aes-256-cbc -K $encrypted_39a50b90a369_key -iv $encrypted_39a50b90a369_iv -in travis.tar.enc -out travis.tar -d - tar xvf travis.tar -- mkdir -p ~/.mdf/credentials/ -- mv MDF_Forge_tokens.json ~/.mdf/credentials/MDF_Forge_tokens.json +- mv .globus-native-apps.cfg ~/.globus-native-apps.cfg after_success: - coveralls notifications: diff --git a/mdf_forge/forge.py b/mdf_forge/forge.py index 8f00e38..fc72f45 100644 --- a/mdf_forge/forge.py +++ b/mdf_forge/forge.py @@ -26,6 +26,7 @@ class Forge(mdf_toolbox.AggregateHelper, mdf_toolbox.SearchHelper): __auth_services = ["data_mdf", "transfer", "search", "petrel"] __anon_services = ["search"] __app_name = "MDF_Forge" + __client_id = "b2b437c4-17c1-4e4b-8f15-e9783e1312d7" __transfer_interval = 60 # 1 minute, in seconds __inactivity_time = 1 * 60 * 60 # 1 hour, in seconds @@ -78,11 +79,13 @@ def __init__(self, index=__default_index, local_ep=None, anonymous=False, clients = (mdf_toolbox.anonymous_login(services) if services else {}) else: services = kwargs.get('services', self.__auth_services) - clients = (mdf_toolbox.login( - credentials={ - "app_name": self.__app_name, - "services": services}, - clear_old_tokens=clear_old_tokens) if services else {}) + if services: + clients = mdf_toolbox.login(services=services, app_name=self.__app_name, + client_id=self.__client_id, + clear_old_tokens=clear_old_tokens) + else: + clients = {} + search_client = kwargs.pop("search_client", clients.get("search", None)) self.__transfer_client = kwargs.get("transfer_client", clients.get("transfer", None)) self.__data_mdf_authorizer = kwargs.get("data_mdf_authorizer", diff --git a/setup.py b/setup.py index 1f8d124..6efcdf4 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='mdf_forge', - version='0.7.4', + version='0.7.5', packages=['mdf_forge'], description='Materials Data Facility python package', long_description=("Forge is the Materials Data Facility Python package" @@ -10,7 +10,7 @@ "Forge allows users to perform simple queries and " "facilitiates moving and synthesizing results."), install_requires=[ - "mdf-toolbox>=0.4.10", + "mdf-toolbox>=0.5.0", "globus-sdk>=1.7.0", "requests>=2.18.4", "tqdm>=4.19.4" diff --git a/travis.tar.enc b/travis.tar.enc index 3163d6f..1ad5c5e 100644 Binary files a/travis.tar.enc and b/travis.tar.enc differ