dcor-shared 0.11.2__tar.gz → 0.11.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/.github/workflows/check.yml +2 -2
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/.github/workflows/deploy_pypi.yml +2 -2
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/CHANGELOG +2 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/PKG-INFO +1 -1
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/_version.py +2 -2
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/s3.py +1 -2
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared.egg-info/PKG-INFO +1 -1
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/.gitignore +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/LICENSE +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/MANIFEST.in +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/README.rst +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/Vagrantfile +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/__init__.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/ckan.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/data.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/dcinst.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/mime.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/parse.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/paths.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/s3cc.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared/testing.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared.egg-info/SOURCES.txt +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared.egg-info/dependency_links.txt +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared.egg-info/requires.txt +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/dcor_shared.egg-info/top_level.txt +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/pyproject.toml +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/setup.cfg +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/tests/data/calibration_beads_47.rtdc +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/tests/requirements.txt +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/tests/test_basic.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/tests/test_ckan.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/tests/test_data.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/tests/test_s3.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/tests/test_s3cc.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/tests/test_testing.py +0 -0
- {dcor_shared-0.11.2 → dcor_shared-0.11.3}/vagrant-run-tests.sh +0 -0
|
@@ -11,9 +11,9 @@ jobs:
|
|
|
11
11
|
checks:
|
|
12
12
|
runs-on: macos-12
|
|
13
13
|
steps:
|
|
14
|
-
- uses: actions/checkout@
|
|
14
|
+
- uses: actions/checkout@main
|
|
15
15
|
- name: Set up Python 3.8
|
|
16
|
-
uses: actions/setup-python@
|
|
16
|
+
uses: actions/setup-python@main
|
|
17
17
|
with:
|
|
18
18
|
python-version: "3.8"
|
|
19
19
|
- name: Install flake8 dependencies
|
|
@@ -11,9 +11,9 @@ jobs:
|
|
|
11
11
|
runs-on: ubuntu-latest
|
|
12
12
|
|
|
13
13
|
steps:
|
|
14
|
-
- uses: actions/checkout@
|
|
14
|
+
- uses: actions/checkout@main
|
|
15
15
|
- name: Set up Python
|
|
16
|
-
uses: actions/setup-python@
|
|
16
|
+
uses: actions/setup-python@main
|
|
17
17
|
with:
|
|
18
18
|
python-version: "3.9"
|
|
19
19
|
- name: Install dependencies
|
|
@@ -289,7 +289,6 @@ def create_time():
|
|
|
289
289
|
@functools.lru_cache()
|
|
290
290
|
def get_s3():
|
|
291
291
|
"""Return the current S3 client as defined by ckan.ini"""
|
|
292
|
-
from ckan import common as ckan_common
|
|
293
292
|
# Create a new session (do not use the default session)
|
|
294
293
|
s3_session = boto3.Session(
|
|
295
294
|
aws_access_key_id=get_ckan_config_option(
|
|
@@ -297,7 +296,7 @@ def get_s3():
|
|
|
297
296
|
aws_secret_access_key=get_ckan_config_option(
|
|
298
297
|
"dcor_object_store.secret_access_key"),
|
|
299
298
|
)
|
|
300
|
-
ssl_verify =
|
|
299
|
+
ssl_verify = get_ckan_config_option("dcor_object_store.ssl_verify")
|
|
301
300
|
if isinstance(ssl_verify, str):
|
|
302
301
|
# additional check (in case CKAN did not convert to bool)
|
|
303
302
|
ssl_verify = ssl_verify.lower() == "true"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|