dcor-shared 0.12.1__tar.gz → 0.12.2__tar.gz

{dcor_shared-0.12.1 → dcor_shared-0.12.2}/.github/workflows/check.yml

@@ -72,8 +72,8 @@ jobs:
 
       - name: Install and setup DCOR
         run: |
-          # pip3 install dcor_control
-          pip3 install git+https://github.com/DCOR-dev/dcor_control
+          pip3 install dcor_control
+
           # use test-core.ini as default
           cp /srv/app/src/ckan/test-core.ini /srv/app/ckan.ini
           # initialize CKAN database

{dcor_shared-0.12.1 → dcor_shared-0.12.2}/CHANGELOG

@@ -1,3 +1,5 @@
+0.12.2
+ - fix: testing did not append S3 resources
 0.12.1
  - ci: migrate to docker
  - ref: deprecate `get_resource_path`, `make_dataset`, `make_resource`

{dcor_shared-0.12.1 → dcor_shared-0.12.2}/PKG-INFO

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

{dcor_shared-0.12.1 → dcor_shared-0.12.2}/dcor_shared/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.12.1'
-__version_tuple__ = version_tuple = (0, 12, 1)
+__version__ = version = '0.12.2'
+__version_tuple__ = version_tuple = (0, 12, 2)

{dcor_shared-0.12.1 → dcor_shared-0.12.2}/dcor_shared/testing.py

@@ -168,7 +168,6 @@ def make_dataset_via_s3(
         rid = make_resource_via_s3(resource_path=resource_path,
                                    organization_id=owner_org["id"],
                                    dataset_id=ds_dict["id"],
-                                   create_context=create_context,
                                    private=ds_dict.get("private", False)
                                    )
     else:
@@ -212,9 +211,21 @@ def make_resource_via_s3(
         resource_path: pathlib.Path | str,
         organization_id: str,
         dataset_id: str,
-        create_context: Dict,
-        private: bool = False):
+        create_context: Dict = None,
+        private: bool = False,
+        ret_dict: bool = False,
+        ):
     """Upload a resource to S3 and register it with CKAN"""
+    if create_context is not None:
+        warnings.warn("Create context has no effect for creating resources "
+                      f"via S3 for testing (got {create_context})",
+                      DeprecationWarning)
+
+    user = factories.Sysadmin()
+    create_context = {'ignore_auth': False,
+                      'user': user['name'],
+                      'api_version': 3}
+
     bucket_name = get_ckan_config_option(
         "dcor_object_store.bucket_name").format(
         organization_id=organization_id)
@@ -228,15 +239,18 @@ def make_resource_via_s3(
 
     revise_dict = {
         "match": {"id": dataset_id},
-        "update": {"resources": [{"id": rid,
-                                  "name": resource_path.name,
-                                  "s3_available": True,
-                                  }
-                                 ]
-                   }
+        "update__resources__extend": [{
+            "id": rid,
+            "name": resource_path.name,
+            "s3_available": True,
+            }]
         }
     helpers.call_action("package_revise", create_context, **revise_dict)
-    return rid
+    if ret_dict:
+        res_dict = helpers.call_action("resource_show", id=rid)
+        return res_dict
+    else:
+        return rid
 
 
 def synchronous_enqueue_job(job_func, args=None, kwargs=None, title=None,

{dcor_shared-0.12.1 → dcor_shared-0.12.2}/dcor_shared.egg-info/PKG-INFO

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