oasis-data-manager 0.1.4__tar.gz → 0.1.6__tar.gz

{oasis-data-manager-0.1.4/oasis_data_manager.egg-info → oasis-data-manager-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oasis-data-manager
-Version: 0.1.4
+Version: 0.1.6
 Summary: UNKNOWN
 Home-page: https://github.com/OasisLMF/OasisDataManager
 Author: Oasis LMF

oasis-data-manager-0.1.6/oasis_data_manager/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.1.6'

{oasis-data-manager-0.1.4 → oasis-data-manager-0.1.6}/oasis_data_manager/filestore/backends/aws_s3.py

@@ -170,7 +170,6 @@ class AwsS3Storage(BaseStorage):
             s3_additional_kwargs["StorageClass"] = "REDUCED_REDUNDANCY"
 
         return {
-            "anon": not self.access_key and not self.security_token,
             "key": self.access_key,
             "secret": self.secret_key,
             "token": self.security_token,

{oasis-data-manager-0.1.4 → oasis-data-manager-0.1.6}/oasis_data_manager/filestore/backends/azure_abfs.py

@@ -115,13 +115,21 @@ class AzureABFSStorage(BaseStorage):
         if self._connection_string:
             return self._connection_string
         else:
+            fsspec_storage_options = {
+                "anon": not self.account_key,
+                "account_name": self.account_name,
+                "account_key": self.account_key,
+                "use_ssl": self.azure_ssl,
+            }
+            fs = self.fsspec_filesystem_class(**fsspec_storage_options)
+
             cs = ""
             if self.endpoint_url:
                 cs += f"BlobEndpoint={self.endpoint_url};"
-            if self.account_name:
-                cs += f"AccountName={self.account_name};"
-            if self.account_key:
-                cs += f"AccountKey={self.account_key};"
+            if fs.account_name:
+                cs += f"AccountName={fs.account_name};"
+            if fs.account_key:
+                cs += f"AccountKey={fs.account_key};"
 
             return cs
 
@@ -132,17 +140,7 @@ class AzureABFSStorage(BaseStorage):
 
         params = {}
         if encode_params:
-            if self.connection_string:
-                params["connection_string"] = self.connection_string
-            else:
-                if self.account_name:
-                    params["account"] = self.account_name
-
-                if self.account_key:
-                    params["key"] = self.account_key
-
-                if self.endpoint_url:
-                    params["endpoint"] = self.endpoint_url
+            params["connection_string"] = self.connection_string
 
         return (
             filename,

{oasis-data-manager-0.1.4 → oasis-data-manager-0.1.6/oasis_data_manager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oasis-data-manager
-Version: 0.1.4
+Version: 0.1.6
 Summary: UNKNOWN
 Home-page: https://github.com/OasisLMF/OasisDataManager
 Author: Oasis LMF

oasis-data-manager-0.1.4/oasis_data_manager/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.1.4'