From 789be3cfd6122b231f5f0cc9dd1c765e2194a43d Mon Sep 17 00:00:00 2001 From: Daniel <d.hornung@indiscale.com> Date: Wed, 21 Feb 2024 16:46:01 +0100 Subject: [PATCH] caosdb -> linkahead, at least for the crawler unit tests --- src/caosadvancedtools/cache.py | 2 +- src/caosadvancedtools/cfood.py | 8 ++++---- src/caosadvancedtools/crawler.py | 4 ++-- src/caosadvancedtools/datamodel_problems.py | 8 ++++---- src/caosadvancedtools/guard.py | 2 +- src/caosadvancedtools/serverside/generic_analysis.py | 4 ++-- src/caosadvancedtools/serverside/helper.py | 2 +- src/caosadvancedtools/utils.py | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/caosadvancedtools/cache.py b/src/caosadvancedtools/cache.py index cf74e330..0ffc7282 100644 --- a/src/caosadvancedtools/cache.py +++ b/src/caosadvancedtools/cache.py @@ -33,7 +33,7 @@ from abc import ABC, abstractmethod from copy import deepcopy from hashlib import sha256 -import caosdb as db +import linkahead as db from lxml import etree diff --git a/src/caosadvancedtools/cfood.py b/src/caosadvancedtools/cfood.py index c0da4f01..7c71f8a4 100644 --- a/src/caosadvancedtools/cfood.py +++ b/src/caosadvancedtools/cfood.py @@ -43,10 +43,10 @@ import warnings from abc import ABCMeta, abstractmethod from datetime import datetime -import caosdb as db -from caosdb.common.models import Entity -from caosdb.exceptions import (BadQueryError, EmptyUniqueQueryError, - QueryNotUniqueError, TransactionError) +import linkahead as db +from linkahead.common.models import Entity +from linkahead.exceptions import (BadQueryError, EmptyUniqueQueryError, + QueryNotUniqueError, TransactionError) from .datamodel_problems import DataModelProblems from .guard import global_guard as guard diff --git a/src/caosadvancedtools/crawler.py b/src/caosadvancedtools/crawler.py index 5e84bc8a..1e5a518f 100644 --- a/src/caosadvancedtools/crawler.py +++ b/src/caosadvancedtools/crawler.py @@ -47,8 +47,8 @@ import uuid from datetime import datetime from sqlite3 import IntegrityError -import caosdb as db -from caosdb.exceptions import BadQueryError +import linkahead as db +from linkahead.exceptions import BadQueryError from .cache import IdentifiableCache, UpdateCache, get_pretty_xml from .cfood import RowCFood, add_files, get_ids_for_entities_with_names diff --git a/src/caosadvancedtools/datamodel_problems.py b/src/caosadvancedtools/datamodel_problems.py index df5b7e56..e96bf799 100644 --- a/src/caosadvancedtools/datamodel_problems.py +++ b/src/caosadvancedtools/datamodel_problems.py @@ -27,10 +27,10 @@ be inserted by hand or gueesed from possible exceptions when inserting or updating entities with missing parents and/or properties. """ -from caosdb.exceptions import (EntityDoesNotExistError, - TransactionError, - UnqualifiedParentsError, - UnqualifiedPropertiesError) +from linkahead.exceptions import (EntityDoesNotExistError, + TransactionError, + UnqualifiedParentsError, + UnqualifiedPropertiesError) class DataModelProblems(object): diff --git a/src/caosadvancedtools/guard.py b/src/caosadvancedtools/guard.py index aa37448d..16cf7304 100644 --- a/src/caosadvancedtools/guard.py +++ b/src/caosadvancedtools/guard.py @@ -18,7 +18,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -import caosdb as db +import linkahead as db RETRIEVE = 0 INSERT = 1 diff --git a/src/caosadvancedtools/serverside/generic_analysis.py b/src/caosadvancedtools/serverside/generic_analysis.py index 85d0c860..a0ff479d 100644 --- a/src/caosadvancedtools/serverside/generic_analysis.py +++ b/src/caosadvancedtools/serverside/generic_analysis.py @@ -87,8 +87,8 @@ import logging import os import sys -import caosdb as db -from caosdb.utils.server_side_scripting import run_server_side_script +import linkahead as db +from linkahead.utils.server_side_scripting import run_server_side_script logger = logging.getLogger(__name__) diff --git a/src/caosadvancedtools/serverside/helper.py b/src/caosadvancedtools/serverside/helper.py index ba75739e..a7db2519 100644 --- a/src/caosadvancedtools/serverside/helper.py +++ b/src/caosadvancedtools/serverside/helper.py @@ -30,7 +30,7 @@ import sys from email import message, policy, utils from tempfile import NamedTemporaryFile -import caosdb as db +import linkahead as db def wrap_bootstrap_alert(text, kind): diff --git a/src/caosadvancedtools/utils.py b/src/caosadvancedtools/utils.py index 4d6a4b36..d03583a1 100644 --- a/src/caosadvancedtools/utils.py +++ b/src/caosadvancedtools/utils.py @@ -27,8 +27,8 @@ import logging import os import pathlib -import caosdb as db -from caosdb.exceptions import TransactionError +import linkahead as db +from linkahead.exceptions import TransactionError logger = logging.getLogger(__name__) -- GitLab