diff --git a/.isort.cfg b/.isort.cfg index 50e0fc3797f5ed69ab18fdd193ff13b8bcf44df2..f42f7aea53dd622afa01529598c06089cdc1b422 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -8,4 +8,4 @@ line_length = 88 default_section=FIRSTPARTY known_first_party = arkindex,arkindex_common -known_third_party = Levenshtein,PIL,apistar,boto3,docker,ijson,lxml,pdf2image,requests,requests_mock,setuptools,tenacity,transkribus,yaml,zstandard +known_third_party = Levenshtein,PIL,apistar,boto3,docker,ijson,lxml,pdf2image,requests,requests_mock,setuptools,teklia_toolbox,tenacity,transkribus,yaml,zstandard diff --git a/arkindex_tasks/import_files/pdf.py b/arkindex_tasks/import_files/pdf.py index 8ecfec2f8f0c297973c827d34ce1c78b8cd6e73a..8cfd6e0305422096186f63c12f00f1de047d66f6 100644 --- a/arkindex_tasks/import_files/pdf.py +++ b/arkindex_tasks/import_files/pdf.py @@ -6,8 +6,7 @@ from glob import glob from pathlib import Path from pdf2image import convert_from_path - -from arkindex_common.tools import Timer +from teklia_toolbox.time import Timer logger = logging.getLogger(__name__) diff --git a/arkindex_tasks/import_git/parser.py b/arkindex_tasks/import_git/parser.py index 0732ad29465fb665b21f83205cdfe93102583736..dcb8a187ab2e23bbfd69a551ebb0bb6a3481be0e 100644 --- a/arkindex_tasks/import_git/parser.py +++ b/arkindex_tasks/import_git/parser.py @@ -3,7 +3,7 @@ import glob import os from pathlib import Path -from arkindex_common.config_parser import ConfigParser +from teklia_toolbox.config import ConfigParser def worker_configuration_parser(): diff --git a/arkindex_tasks/import_s3/__main__.py b/arkindex_tasks/import_s3/__main__.py index 1346b45930773c1425d3ab6578eaeabf6d7fa104..ef0ea731ffd12fb6270ac6da5c4c392ee9af57cb 100644 --- a/arkindex_tasks/import_s3/__main__.py +++ b/arkindex_tasks/import_s3/__main__.py @@ -5,8 +5,8 @@ import logging import uuid import yaml +from teklia_toolbox.time import Timer -from arkindex_common.tools import Timer from arkindex_tasks import default_client from arkindex_tasks.base import split_chunks from arkindex_tasks.import_s3 import get_bucket diff --git a/arkindex_tasks/import_s3/volumes_import.py b/arkindex_tasks/import_s3/volumes_import.py index 5d75060745ca38ee13f49e3acab7d0dcca9a4be9..d482b4c7e7e912560dc1d499c3653ea59502832c 100644 --- a/arkindex_tasks/import_s3/volumes_import.py +++ b/arkindex_tasks/import_s3/volumes_import.py @@ -10,8 +10,8 @@ import requests import yaml from apistar.exceptions import ErrorResponse from PIL import Image +from teklia_toolbox.time import Timer -from arkindex_common.tools import Timer from arkindex_tasks import default_client from arkindex_tasks.base import dump_elements, dump_json from arkindex_tasks.import_s3 import IIIF_MIME_TYPES, get_bucket diff --git a/requirements.txt b/requirements.txt index 91bb475c6f1570f3f5a03c673bdc6fdaa7f8a588..761995ef0a542b59cc46f696563125fb5cf207bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,6 @@ arkindex-common>=0.2.0 boto3==1.9 docker==3.6.0 ijson==3.1.2 +teklia-toolbox==0.1.0 tenacity==6.2.0 transkribus-client==0.2.1 diff --git a/tests/import_git/test_base.py b/tests/import_git/test_base.py index 13d87dfece3cb3a58751318b0a22a6613f2cec47..e0a74ecd47569590d16f19c8d99ffe42449a270b 100644 --- a/tests/import_git/test_base.py +++ b/tests/import_git/test_base.py @@ -8,8 +8,8 @@ from uuid import uuid4 import requests_mock import yaml from apistar.exceptions import ErrorResponse +from teklia_toolbox.config import ConfigurationError -from arkindex_common.config_parser import ConfigurationError from arkindex_tasks.import_git.base import GitImportTask, GitImportTaskType SAMPLES = Path(__file__).absolute().parent / "samples"