dcor-shared 1.0.4__tar.gz → 1.1.0__tar.gz

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/.github/workflows/check.yml

@@ -46,7 +46,7 @@ jobs:
       redis:
         image: redis:3
       minio:
-        image: raghavaalajangi95/dcor-minio:latest
+        image: mpzpm/dcor-dev:minio-latest
         # Note:
         # The official MinIO setup uses standalone mode, which has limitations:
         # - Certain 'mc admin' commands, such as user and policy management, are not supported.

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/CHANGELOG

@@ -1,3 +1,12 @@
+1.1.0
+ - BREAKING: remove unused `paths.get_nginx_config_path`,
+   `paths.get_supervisord_worker_config_path`, `paths.get_uwsgi_config_path`,
+   and `VALID_FORMATS`
+ - BREAKING: remove the `testing.create_with_upload_no_temp` fixture
+   (resources cannot be uploaded via CKAN anymore)
+ - fix: use the actual site user instead of the user "default" in
+   `get_resource_info` and `wait_for_resource`
+ - enh: new `admin_context` returning the context of the site user
 1.0.4
  - enh: implement "artifact" kwarg for `s3cc.compute_checksum`
  - enh: introduce `enable_basins` in `s3cc.get_s3_dc_handle`

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/PKG-INFO

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

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/dcor_shared/__init__.py

@@ -1,11 +1,11 @@
 # flake8: noqa: F401
 from .ckan import (
-    get_ckan_config_option, get_ckan_storage_path, get_resource_dc_config,
-    get_resource_info, is_resource_private
+    admin_context, get_ckan_config_option, get_ckan_storage_path,
+    get_resource_dc_config, get_resource_info, is_resource_private
 )
 from .data import wait_for_resource
 from .dcinst import get_dc_instance
-from .mime import DC_MIME_TYPES, VALID_FORMATS
+from .mime import DC_MIME_TYPES
 from . import paths
 from .rqjob import RQJob, rqjob_register
 from .util import sha256sum

dcor_shared-1.1.0/dcor_shared/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)
+
+__commit_id__ = commit_id = 'gf8fde438a'

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/dcor_shared/ckan.py

@@ -4,6 +4,17 @@ import pathlib
 from .parse import get_ini_config_option
 
 
+def admin_context():
+    """Context of the CKAN site user (sysadmin)
+
+    The site user is named after `ckan.site_id`, which is "default"
+    unless specified otherwise.
+    """
+    from ckan import logic
+    site_user = logic.get_action("get_site_user")({"ignore_auth": True}, {})
+    return {'ignore_auth': True, 'user': site_user["name"]}
+
+
 def get_ckan_config_option(option):
     """Return the CKAN configuration option
 
@@ -64,10 +75,10 @@ def get_resource_info(resource_id):
     """
     from ckan import logic
     res_dict = logic.get_action("resource_show")(
-        context={'ignore_auth': True, 'user': 'default'},
+        context=admin_context(),
         data_dict={"id": resource_id})
     ds_dict = logic.get_action("package_show")(
-        context={'ignore_auth': True, 'user': 'default'},
+        context=admin_context(),
         data_dict={"id": res_dict["package_id"]})
     return ds_dict, res_dict
 

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/dcor_shared/data.py

@@ -2,6 +2,7 @@ import functools
 import time
 
 from . import s3cc
+from .ckan import admin_context
 from .util import sha256sum  # noqa: F401
 
 
@@ -30,8 +31,7 @@ def wait_for_resource(resource_id: str,
     t0 = time.time()
     while True:
         try:
-            res_dict = resource_show(context={'ignore_auth': True,
-                                              'user': 'default'},
+            res_dict = resource_show(context=admin_context(),
                                      data_dict={"id": resource_id})
         except logic.NotFound:
             # Other processes are still working on getting the resource

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/dcor_shared/mime.py

@@ -4,6 +4,3 @@ DC_MIME_TYPES = {
     "RT-DC": ".rtdc",
     "DC": ".dc",  # more general
 }
-
-#: Valid values for resource "format"
-VALID_FORMATS = sorted(DC_MIME_TYPES.keys()) + ["RT-FDC"]

dcor_shared-1.1.0/dcor_shared/paths.py

@@ -0,0 +1,2 @@
+from .ckan import get_ckan_storage_path, get_ckan_webassets_path  # noqa: F401
+from .ckan import get_ckan_config_path  # noqa: F401

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/dcor_shared/testing.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from io import BytesIO
 import numbers
 import pathlib
 from typing import Dict, List
@@ -10,41 +9,12 @@ import ckan.authz
 import ckan.model
 import ckan.tests.factories as factories
 import ckan.tests.helpers as helpers
-from ckan.tests.pytest_ckan.fixtures import FakeFileStorage
 import requests
 
-import pytest
-
 from .ckan import get_ckan_config_option
 from . import s3
 
 
-@pytest.fixture
-def create_with_upload_no_temp(clean_db, ckan_config, monkeypatch):
-    """
-    Create upload without tempdir
-    """
-
-    def factory(data, filename, context=None, **kwargs):
-        if context is None:
-            context = {}
-        action = kwargs.pop("action", "resource_create")
-        field = kwargs.pop("upload_field_name", "upload")
-        test_file = BytesIO()
-        if type(data) is not bytes:
-            data = bytes(data, encoding="utf-8")
-        test_file.write(data)
-        test_file.seek(0)
-        test_resource = FakeFileStorage(test_file, filename)
-
-        params = {
-            field: test_resource,
-        }
-        params.update(kwargs)
-        return helpers.call_action(action, context, **params)
-    return factory
-
-
 def activate_dataset(ds_id, create_context=None):
     """Activate a dataset by setting its "state" to "active"."""
 

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/dcor_shared.egg-info/PKG-INFO

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

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/dcor_shared.egg-info/SOURCES.txt

@@ -23,6 +23,8 @@ dcor_shared.egg-info/PKG-INFO
 dcor_shared.egg-info/SOURCES.txt
 dcor_shared.egg-info/dependency_links.txt
 dcor_shared.egg-info/requires.txt
+dcor_shared.egg-info/scm_file_list.json
+dcor_shared.egg-info/scm_version.json
 dcor_shared.egg-info/top_level.txt
 tests/requirements.txt
 tests/test_ckan.py

dcor_shared-1.1.0/dcor_shared.egg-info/scm_file_list.json

@@ -0,0 +1,31 @@
+{
+  "files": [
+    ".github/workflows/check.yml",
+    ".github/workflows/deploy_pypi.yml",
+    ".gitignore",
+    "CHANGELOG",
+    "LICENSE",
+    "MANIFEST.in",
+    "README.rst",
+    "dcor_shared/__init__.py",
+    "dcor_shared/ckan.py",
+    "dcor_shared/data.py",
+    "dcor_shared/dcinst.py",
+    "dcor_shared/mime.py",
+    "dcor_shared/parse.py",
+    "dcor_shared/paths.py",
+    "dcor_shared/rqjob.py",
+    "dcor_shared/s3.py",
+    "dcor_shared/s3cc.py",
+    "dcor_shared/testing.py",
+    "dcor_shared/util.py",
+    "pyproject.toml",
+    "tests/data/calibration_beads_47.rtdc",
+    "tests/requirements.txt",
+    "tests/test_ckan.py",
+    "tests/test_data.py",
+    "tests/test_s3.py",
+    "tests/test_s3cc.py",
+    "tests/test_testing.py"
+  ]
+}

dcor_shared-1.1.0/dcor_shared.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.1.0",
+  "distance": 0,
+  "node": "gf8fde438a101b69e41ea10ad9d312cc339582c33",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-11-05"
+}

{dcor_shared-1.0.4 → dcor_shared-1.1.0}/tests/test_data.py

@@ -6,6 +6,8 @@ import uuid
 
 from ckan import logic
 
+import dcor_shared.data
+
 from dcor_shared import (
     get_dc_instance, s3, sha256sum, wait_for_resource
 )
@@ -98,6 +100,8 @@ def test_sha256sum(tmp_path):
 
 def test_wait_for_resource_s3(monkeypatch):
     res_id = str(uuid.uuid4())
+    monkeypatch.setattr(dcor_shared.data, "admin_context",
+                        lambda: {"ignore_auth": True})
     monkeypatch.setattr(logic, "get_action",
                         lambda x: lambda context, data_dict: {
                             "id": res_id,
@@ -108,6 +112,8 @@ def test_wait_for_resource_s3(monkeypatch):
 
 def test_wait_resource_not_available(monkeypatch):
     res_id = str(uuid.uuid4())
+    monkeypatch.setattr(dcor_shared.data, "admin_context",
+                        lambda: {"ignore_auth": True})
     monkeypatch.setattr(logic, "get_action",
                         lambda x: lambda context, data_dict: {
                             "id": res_id})

dcor_shared-1.0.4/dcor_shared/_version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '1.0.4'
-__version_tuple__ = version_tuple = (1, 0, 4)

dcor_shared-1.0.4/dcor_shared/paths.py

@@ -1,16 +0,0 @@
-import pathlib
-
-from .ckan import get_ckan_storage_path, get_ckan_webassets_path  # noqa: F401
-from .ckan import get_ckan_config_path  # noqa: F401
-
-
-def get_nginx_config_path():
-    return pathlib.Path("/etc/nginx/sites-enabled/ckan")
-
-
-def get_supervisord_worker_config_path():
-    return pathlib.Path("/etc/supervisor/conf.d/ckan-worker.conf")
-
-
-def get_uwsgi_config_path():
-    return pathlib.Path("/etc/ckan/default/ckan-uwsgi.ini")