Merge pull request datajoint#676 from datajoint/master

Incorporate latest HotFixes into dev

Author: Chris Turner

datajoint/blob.py

@@ -12,6 +12,7 @@
 import numpy as np
 from .errors import DataJointError
 from .utils import OrderedDict
+from .settings import config
 
 
 mxClassID = OrderedDict((
@@ -71,6 +72,9 @@ def __init__(self, squeeze=False):
         self.protocol = None
 
     def set_dj0(self):
+        if not config.get('enable_python_native_blobs'):
+            raise DataJointError('v0.12+ python native blobs disabled. see also: https://github.com/datajoint/datajoint-python/blob/master/README.md')
+
         self.protocol = b"dj0\0"  # when using new blob features
 
     def squeeze(self, array, convert_to_scalar=True):

datajoint/s3.py

@@ -13,8 +13,8 @@ class Folder:
     """
     A Folder instance manipulates a flat folder of objects within an S3-compatible object store
     """
-    def __init__(self, endpoint, bucket, access_key, secret_key, **_):
-        self.client = minio.Minio(endpoint, access_key=access_key, secret_key=secret_key, secure=False)
+    def __init__(self, endpoint, bucket, access_key, secret_key, *, secure=False, **_):
+        self.client = minio.Minio(endpoint, access_key=access_key, secret_key=secret_key, secure=secure)
         self.bucket = bucket
         if not self.client.bucket_exists(bucket):
             warnings.warn('Creating bucket "%s"' % self.bucket)

datajoint/settings.py

@@ -43,7 +43,8 @@
     'display.limit': 12,
     'display.width': 14,
     'display.show_tuple_count': True,
-    'database.use_tls': None
+    'database.use_tls': None,
+    'enable_python_native_blobs': False,  # python-native/dj0 encoding support
 })
 
 logger = logging.getLogger(__name__)
@@ -136,7 +137,7 @@ def get_store_spec(self, store):
         spec['subfolding'] = spec.get('subfolding', DEFAULT_SUBFOLDING)
         spec_keys = {  # REQUIRED in uppercase and allowed in lowercase
             'file': ('PROTOCOL', 'LOCATION', 'subfolding', 'stage'),
-            's3': ('PROTOCOL', 'ENDPOINT', 'BUCKET', 'ACCESS_KEY', 'SECRET_KEY', 'LOCATION', 'subfolding', 'stage')}
+            's3': ('PROTOCOL', 'ENDPOINT', 'BUCKET', 'ACCESS_KEY', 'SECRET_KEY', 'LOCATION', 'secure', 'subfolding', 'stage')}
 
         try:
             spec_keys = spec_keys[spec.get('protocol', '').lower()]
@@ -146,7 +147,7 @@ def get_store_spec(self, store):
 
         # check that all required keys are present in spec
         try:
-            raise DataJointError('dj.config["stores"]["{store}" is missing "{k}"'.format(
+            raise DataJointError('dj.config["stores"]["{store}"] is missing "{k}"'.format(
                 store=store, k=next(k.lower() for k in spec_keys if k.isupper() and k.lower() not in spec)))
         except StopIteration:
             pass