dcor-shared 0.10.0__tar.gz → 0.10.2__tar.gz

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/CHANGELOG

@@ -1,3 +1,7 @@
+0.10.2
+ - setup: bump dclab to 0.58.6
+0.10.1
+ - fix: handle case in wait_for_resource when resource is not yet in CKAN
 0.10.0
  - BREAKING CHANGE: presigned URLs for uploading resources now work
    differently. For small files (< 1 GiB), a single upload URL for

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcor_shared
-Version: 0.10.0
+Version: 0.10.2
 Summary: Functionalities shared by the DCOR CKAN extensions
 Home-page: https://github.com/DCOR-dev/dcor_shared
 Author: Paul Müller

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/dcor_shared/_version_save.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python
 # This file was created automatically
-longversion = '0.10.0'
+longversion = '0.10.2'

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/dcor_shared/data.py

@@ -64,9 +64,15 @@ def wait_for_resource(resource_id: str,
     t0 = time.time()
     ld = len(DUMMY_BYTES)
     while True:
-        res_dict = resource_show(context={'ignore_auth': True,
-                                          'user': 'default'},
-                                 data_dict={"id": resource_id})
+        try:
+            res_dict = resource_show(context={'ignore_auth': True,
+                                              'user': 'default'},
+                                     data_dict={"id": resource_id})
+        except logic.NotFound:
+            # Other processes are still working on getting the resource
+            # online. We have to wait.
+            time.sleep(0.1)
+            continue
 
         s3_ok = res_dict.get("s3_available", None)
         if time.time() - t0 > timeout:

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/dcor_shared/s3cc.py

@@ -181,9 +181,9 @@ def get_s3_dc_handle(resource_id):
     s3_url = get_s3_url_for_artifact(resource_id)
     ds = fmt_s3.RTDC_S3(
         url=s3_url,
-        secret_id=get_ckan_config_option(
+        secret_access_key=get_ckan_config_option(
             "dcor_object_store.access_key_id"),
-        secret_key=get_ckan_config_option(
+        access_key_id=get_ckan_config_option(
             "dcor_object_store.secret_access_key"),
         # Disable basins, because they could point to files on the
         # local file system (security).

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/dcor_shared/testing.py

@@ -296,10 +296,10 @@ def upload_presigned_to_s3(
             # Finish the multipart upload
             c_xml = "<CompleteMultipartUpload>\n"
             for ii, etag in enumerate(etags):
-                c_xml += (f"  <Part>\n"
+                c_xml += ("  <Part>\n"
                           + f"    <PartNumber>{ii + 1}</PartNumber>\n"
                           + f"    <ETag>{etag}</ETag>\n"
-                          + f"  </Part>\n"
+                          + "  </Part>\n"
                           )
             c_xml += "</CompleteMultipartUpload>"
             resp = requests.post(

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/dcor_shared.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcor-shared
-Version: 0.10.0
+Version: 0.10.2
 Summary: Functionalities shared by the DCOR CKAN extensions
 Home-page: https://github.com/DCOR-dev/dcor_shared
 Author: Paul Müller

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/dcor_shared.egg-info/requires.txt

@@ -1,5 +1,5 @@
 boto3
-dclab[s3]>=0.57.5
+dclab[s3]>=0.58.6
 
 [tests]
 requests

{dcor_shared-0.10.0 → dcor_shared-0.10.2}/setup.py

@@ -44,7 +44,7 @@ setup(
     long_description=open('README.rst').read() if exists('README.rst') else '',
     install_requires=[
         "boto3",
-        "dclab[s3]>=0.57.5",
+        "dclab[s3]>=0.58.6",
     ],
     extras_require={
         # Required for the `dcor_shared.testing` submodule