Merge pull request #49 from scottwernervt/tests/43/package-dependencies

Upgrade package dependencies for each cloud services
scottwernervt · Aug 10, 2019 · d6861aa · d6861aa
2 parents 72a89c2 + 1077def
commit d6861aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -71,18 +71,19 @@ def read(*names, **kwargs):
     ],
     extras_require={
         'amazon': [
-            'boto3>=1.7.60',  # Apache 2.0
+            'boto3>=1.8.00',  # Apache 2.0
         ],
         'google': [
-            'google-cloud-storage>=1.10.0',  # Apache 2.0
+            'google-cloud-storage>=1.18.0',  # Apache 2.0
+            'requests>=2.19.1',  # Apache 2.0
         ],
         'local': [
             'filelock>=3.0.0',  # Public Domain
-            'itsdangerous>=0.24',  # BSD License
-            'xattr>=0.9.3',  # MIT
+            'itsdangerous>=1.1.0',  # BSD License
+            'xattr>=0.9.6',  # MIT
         ],
         'microsoft': [
-            'azure>=3.0.0',  # MIT
+            'azure>=4.0.0',  # MIT
         ],
         'minio': [
             'minio>=4.0.0',  # Apache 2.0
@@ -106,7 +107,7 @@ def read(*names, **kwargs):
         'flake8',  # MIT
         'pytest',  # MIT
         'prettyconf',  # MIT
-        'requests',
+        'requests>=2.19.1',
         'tox',  # MIT
     ],
     test_suite='tests',

diff --git a/src/cloudstorage/drivers/minio.py b/src/cloudstorage/drivers/minio.py
@@ -169,7 +169,8 @@ def _make_obj(self, container: Container, obj: definitions.Object) -> Blob:
         for name, value in obj_metadata.items():
             meta_key = re.sub(r'\b%s\b' % re.escape(self._OBJECT_META_PREFIX),
                               '', name, flags=re.IGNORECASE)
-            meta_data[meta_key] = value
+            if meta_key != name:  # Content-Type key is in the obj meta data
+                meta_data[meta_key] = value
 
         return Blob(name=obj.object_name, checksum='', etag=obj.etag,
                     size=obj.size, container=container, driver=self, acl={},
@@ -428,7 +429,7 @@ def generate_blob_download_url(self, blob: Blob, expires: int = 3600,
         'ssecustomerkey': 'SSECustomerKey',
         'requestpayer': 'RequestPayer',
         'partnumber': 'PartNumber',
-        # Extra keys to standarize across all drivers
+        # Extra keys to standardize across all drivers
         'cachecontrol': 'ResponseCacheControl',
         'contentdisposition': 'ResponseContentDisposition',
         'contentencoding': 'ResponseContentEncoding',