From 98a441666e93e81a17173e048bbb06bc8d86807b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20M=C3=BCller?= Date: Wed, 2 Oct 2024 23:15:29 +0200 Subject: [PATCH] fix: did not extract `dcor_object_store.ssl_verify` from config --- .github/workflows/check.yml | 4 ++-- .github/workflows/deploy_pypi.yml | 4 ++-- CHANGELOG | 2 ++ dcor_shared/s3.py | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ca1ae5d..e34e627 100644 --- a/.github/workflows/check.yml +++ b/.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 diff --git a/.github/workflows/deploy_pypi.yml b/.github/workflows/deploy_pypi.yml index cc48ab5..6567e2a 100644 --- a/.github/workflows/deploy_pypi.yml +++ b/.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 diff --git a/CHANGELOG b/CHANGELOG index 8e68d01..ffc1c9b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +0.11.3 + - fix: did not extract `dcor_object_store.ssl_verify` from config 0.11.2 - build: cleanup 0.11.1 diff --git a/dcor_shared/s3.py b/dcor_shared/s3.py index 91b0522..6bde258 100644 --- a/dcor_shared/s3.py +++ b/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"