[ARVADOS] created: 2d7883822203e66afee1a36c7e86a844bc23719c
git at public.curoverse.com
git at public.curoverse.com
Sat Feb 7 04:29:40 EST 2015
at 2d7883822203e66afee1a36c7e86a844bc23719c (commit)
commit 2d7883822203e66afee1a36c7e86a844bc23719c
Author: Tom Clegg <tom at curoverse.com>
Date: Sat Feb 7 03:59:12 2015 -0500
5037: Use a newer Python SDK (with no connection cache) instead of cache=False.
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 5fee9eb..18011af 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -284,7 +284,7 @@ def run_keep(blob_signing_key=None, enforce_permissions=False):
keep_args['--enforce-permissions'] = 'true'
api = arvados.api(
- 'v1', cache=False,
+ version='v1',
host=os.environ['ARVADOS_API_HOST'],
token=os.environ['ARVADOS_API_TOKEN'],
insecure=True)
@@ -333,7 +333,7 @@ def run_keep_proxy():
env=env)
api = arvados.api(
- 'v1', cache=False,
+ version='v1',
host=os.environ['ARVADOS_API_HOST'],
token=admin_token,
insecure=True)
diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 73a609c..6559614 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -31,10 +31,11 @@ _logger = logging.getLogger('arvados.arvados_fuse')
_disallowed_filename_characters = re.compile('[\x00/]')
class SafeApi(object):
- '''Threadsafe wrapper for API object. This stores and returns a different api
- object per thread, because httplib2 which underlies apiclient is not
- threadsafe.
- '''
+ """Threadsafe wrapper for API object.
+
+ This stores and returns a different api object per thread, because
+ httplib2 which underlies apiclient is not threadsafe.
+ """
def __init__(self, config):
self.host = config.get('ARVADOS_API_HOST')
@@ -45,8 +46,9 @@ class SafeApi(object):
def localapi(self):
if 'api' not in self.local.__dict__:
- self.local.api = arvados.api('v1', False, self.host,
- self.api_token, self.insecure)
+ self.local.api = arvados.api(
+ version='v1',
+ host=self.host, token=self.api_token, insecure=self.insecure)
return self.local.api
def localkeep(self):
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 7c84531..214920a 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -42,7 +42,7 @@ setup(name='arvados_fuse',
'bin/arv-mount'
],
install_requires=[
- 'arvados-python-client>=0.1.20141203150737.277b3c7',
+ 'arvados-python-client>=0.1.20150206225333.64c7093',
'llfuse',
'python-daemon',
],
diff --git a/services/nodemanager/arvnodeman/config.py b/services/nodemanager/arvnodeman/config.py
index b7ec1fc..e15f023 100644
--- a/services/nodemanager/arvnodeman/config.py
+++ b/services/nodemanager/arvnodeman/config.py
@@ -88,8 +88,7 @@ class NodeManagerConfig(ConfigParser.SafeConfigParser):
http = httplib2.Http(timeout=self.getint('Arvados', 'timeout'),
ca_certs=certs_file,
disable_ssl_certificate_validation=insecure)
- return arvados.api('v1',
- cache=False, # Don't reuse an existing client.
+ return arvados.api(version='v1',
host=self.get('Arvados', 'host'),
token=self.get('Arvados', 'token'),
insecure=insecure,
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 5fc4294..6387f5f 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -38,7 +38,7 @@ setup(name='arvados-node-manager',
packages=find_packages(),
install_requires=[
'apache-libcloud',
- 'arvados-python-client',
+ 'arvados-python-client>=0.1.20150206225333.64c7093',
'pykka',
'python-daemon',
],
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list