dcor-shared 0.11.2__tar.gz → 0.11.4__tar.gz

{dcor_shared-0.11.2 → dcor_shared-0.11.4}/.github/workflows/check.yml

@@ -11,9 +11,9 @@ jobs:
   checks:
     runs-on: macos-12
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@main
     - name: Set up Python 3.8
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@main
       with:
         python-version: "3.8"
     - name: Install flake8 dependencies

{dcor_shared-0.11.2 → dcor_shared-0.11.4}/.github/workflows/deploy_pypi.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@main
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@main
       with:
         python-version: "3.9"
     - name: Install dependencies

{dcor_shared-0.11.2 → dcor_shared-0.11.4}/CHANGELOG

@@ -1,3 +1,10 @@
+0.11.4
+ - ref: wait longer in wait_for_resource
+0.11.3
+ - ref: wait longer in `wait_for_resource` loop
+ - ref: turn deprecation in `wait_for_resource` into ValueError
+0.11.3
+ - fix: did not extract `dcor_object_store.ssl_verify` from config
 0.11.2
  - build: cleanup
 0.11.1

{dcor_shared-0.11.2 → dcor_shared-0.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcor_shared
-Version: 0.11.2
+Version: 0.11.4
 Summary: Functionalities shared by the DCOR CKAN extensions
 Author: Paul Müller
 Maintainer-email: Paul Müller <dev@craban.de>

{dcor_shared-0.11.2 → dcor_shared-0.11.4}/dcor_shared/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.11.2'
-__version_tuple__ = version_tuple = (0, 11, 2)
+__version__ = version = '0.11.4'
+__version_tuple__ = version_tuple = (0, 11, 4)

{dcor_shared-0.11.2 → dcor_shared-0.11.4}/dcor_shared/data.py

@@ -2,7 +2,6 @@ import functools
 import hashlib
 import pathlib
 import time
-import warnings
 
 from .ckan import get_resource_path
 
@@ -47,13 +46,7 @@ def wait_for_resource(resource_id: str,
     from ckan import logic
 
     if len(resource_id) != 36:
-        warnings.warn("Please pass the CKAN resource id as `resource_id` "
-                      "instead of a string or a path. This will raise an "
-                      "exception in the future.",
-                      DeprecationWarning)
-        # The user passed a local path on the block storage. These look like
-        # this: /data/dcor-instance/resources/RE/SO/URCE-ID
-        resource_id = "".join(resource_id.split("/")[-3])
+        raise ValueError(f"Invalid resource id: {resource_id}")
 
     resource_show = logic.get_action("resource_show")
     path = pathlib.Path(get_resource_path(resource_id))
@@ -71,7 +64,7 @@ def wait_for_resource(resource_id: str,
         except logic.NotFound:
             # Other processes are still working on getting the resource
             # online. We have to wait.
-            time.sleep(0.1)
+            time.sleep(5)
             continue
 
         s3_ok = res_dict.get("s3_available", None)
@@ -82,17 +75,17 @@ def wait_for_resource(resource_id: str,
             # If the dataset is on S3, it is considered to be available.
             break
         elif not path.exists():
-            time.sleep(0.05)
+            time.sleep(5)
             continue
         elif dcor_depot_available and not path.is_symlink():
             # Resource is only available when it is symlinked by
             # the ckanext.dcor_depot `symlink_user_dataset` job
             # (or by the ckanext.dcor_depot importers).
-            time.sleep(0.05)
+            time.sleep(5)
             continue
         elif path.stat().st_size == ld and path.read_bytes() == DUMMY_BYTES:
             # wait a bit
-            time.sleep(0.01)
+            time.sleep(5)
             continue
         else:
             # not a dummy file

{dcor_shared-0.11.2 → dcor_shared-0.11.4}/dcor_shared/s3.py

@@ -289,7 +289,6 @@ def create_time():
 @functools.lru_cache()
 def get_s3():
     """Return the current S3 client as defined by ckan.ini"""
-    from ckan import common as ckan_common
     # Create a new session (do not use the default session)
     s3_session = boto3.Session(
         aws_access_key_id=get_ckan_config_option(
@@ -297,7 +296,7 @@ def get_s3():
         aws_secret_access_key=get_ckan_config_option(
             "dcor_object_store.secret_access_key"),
     )
-    ssl_verify = ckan_common.config.get("dcor_object_store.ssl_verify")
+    ssl_verify = get_ckan_config_option("dcor_object_store.ssl_verify")
     if isinstance(ssl_verify, str):
         # additional check (in case CKAN did not convert to bool)
         ssl_verify = ssl_verify.lower() == "true"

{dcor_shared-0.11.2 → dcor_shared-0.11.4}/dcor_shared.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcor_shared
-Version: 0.11.2
+Version: 0.11.4
 Summary: Functionalities shared by the DCOR CKAN extensions
 Author: Paul Müller
 Maintainer-email: Paul Müller <dev@craban.de>