dsw-storage 4.12.0__tar.gz → 4.14.0__tar.gz

{dsw_storage-4.12.0/dsw_storage.egg-info → dsw_storage-4.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-storage
-Version: 4.12.0
+Version: 4.14.0
 Summary: Library for managing DSW S3 storage
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -11,16 +11,16 @@ Keywords: dsw,s3,bucket,storage
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Communications :: File Sharing
 Classifier: Topic :: Utilities
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: minio
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.12.0
+Requires-Dist: dsw-config==4.14.0
 
 # Data Stewardship Wizard: Storage
 

{dsw_storage-4.12.0 → dsw_storage-4.14.0}/dsw/storage/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.12.0~f6f9756',
-    built_at='2024-11-07 09:41:22Z',
-    sha='f6f975677676e5749b1e9cc97a0fb9238f18097a',
+    version='v4.14.0~213910f',
+    built_at='2025-01-07 08:18:01Z',
+    sha='213910ffb32a7cea98942ccd0f6c52cb6cf79128',
     branch='HEAD',
-    tag='v4.12.0',
+    tag='v4.14.0',
 )

{dsw_storage-4.12.0 → dsw_storage-4.14.0}/dsw/storage/s3storage.py

@@ -1,13 +1,12 @@
 import contextlib
 import io
 import logging
-import minio  # type: ignore
-import minio.error  # type: ignore
 import pathlib
 import tempfile
-import tenacity
 
-from typing import Optional
+import minio
+import minio.error
+import tenacity
 
 from dsw.config.model import S3Config
 
@@ -35,7 +34,7 @@ class S3Storage:
         parts = url.split('://', maxsplit=1)
         return parts[0] if len(parts) == 1 else parts[1]
 
-    def __init__(self, cfg: S3Config, multi_tenant: bool):
+    def __init__(self, *, cfg: S3Config, multi_tenant: bool):
         self.cfg = cfg
         self.multi_tenant = multi_tenant
         self.client = minio.Minio(
@@ -69,9 +68,9 @@ class S3Storage:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def store_document(self, tenant_uuid: str, file_name: str,
+    def store_document(self, *, tenant_uuid: str, file_name: str,
                        content_type: str, data: bytes,
-                       metadata: Optional[dict] = None):
+                       metadata: dict | None = None):
         object_name = f'{DOCUMENTS_DIR}/{file_name}'
         if self.multi_tenant:
             object_name = f'{tenant_uuid}/{object_name}'
@@ -92,7 +91,7 @@ class S3Storage:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def download_file(self, file_name: str, target_path: pathlib.Path) -> bool:
+    def download_file(self, *, file_name: str, target_path: pathlib.Path) -> bool:
         try:
             self.client.fget_object(
                 bucket_name=self.cfg.bucket,
@@ -112,9 +111,9 @@ class S3Storage:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def store_object(self, tenant_uuid: str, object_name: str,
+    def store_object(self, *, tenant_uuid: str, object_name: str,
                      content_type: str, data: bytes,
-                     metadata: Optional[dict] = None):
+                     metadata: dict | None = None):
         if self.multi_tenant:
             object_name = f'{tenant_uuid}/{object_name}'
         with io.BytesIO(data) as file:

{dsw_storage-4.12.0 → dsw_storage-4.14.0/dsw_storage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-storage
-Version: 4.12.0
+Version: 4.14.0
 Summary: Library for managing DSW S3 storage
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -11,16 +11,16 @@ Keywords: dsw,s3,bucket,storage
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Communications :: File Sharing
 Classifier: Topic :: Utilities
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: minio
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.12.0
+Requires-Dist: dsw-config==4.14.0
 
 # Data Stewardship Wizard: Storage
 

dsw_storage-4.14.0/dsw_storage.egg-info/requires.txt

@@ -0,0 +1,3 @@
+minio
+tenacity
+dsw-config==4.14.0

{dsw_storage-4.12.0 → dsw_storage-4.14.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-storage'
-version = "4.12.0"
+version = "4.14.0"
 description = 'Library for managing DSW S3 storage'
 readme = 'README.md'
 keywords = ['dsw', 's3', 'bucket', 'storage']
@@ -16,17 +16,17 @@ classifiers = [
     'Development Status :: 5 - Production/Stable',
     'License :: OSI Approved :: Apache Software License',
     'Programming Language :: Python',
-    'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     'Topic :: Communications :: File Sharing',
     'Topic :: Utilities',
 ]
-requires-python = '>=3.10, <4'
+requires-python = '>=3.11, <4'
 dependencies = [
     'minio',
     'tenacity',
     # DSW
-    "dsw-config==4.12.0",
+    "dsw-config==4.14.0",
 ]
 
 [project.urls]

dsw_storage-4.12.0/dsw_storage.egg-info/requires.txt

@@ -1,3 +0,0 @@
-minio
-tenacity
-dsw-config==4.12.0