From 4a122dd9e2b1bad4f48452853c0c6f2ac1cbe8e8 Mon Sep 17 00:00:00 2001 From: Daniel <d.hornung@indiscale.com> Date: Thu, 11 May 2023 16:11:11 +0200 Subject: [PATCH] WIP: Rename caosdb -> linkahead --- integrationtests/clear_database.py | 2 +- integrationtests/crawl.py | 12 ++++++------ integrationtests/create_analysis.py | 4 ++-- integrationtests/example_hdf5cfood.py | 8 ++++---- integrationtests/filldb.sh | 10 +++++----- integrationtests/insert_model.py | 8 ++++---- integrationtests/insert_some.py | 4 ++-- integrationtests/test.sh | 6 +++--- integrationtests/test_assure_functions.py | 10 +++++----- .../test_base_table_exporter_integration.py | 4 ++-- integrationtests/test_cache.py | 4 ++-- .../test_crawl_with_datamodel_problems.py | 18 +++++++++--------- integrationtests/test_crawler_basics.py | 8 ++++---- integrationtests/test_crawler_with_cfoods.py | 2 +- integrationtests/test_data_model.py | 4 ++-- integrationtests/test_datamodel_problems.py | 4 ++-- integrationtests/test_im_und_export.py | 6 +++--- .../test_json_schema_datamodel_parser.py | 4 ++-- integrationtests/test_table.py | 8 ++++---- integrationtests/test_yaml_parser.py | 4 ++-- integrationtests/update_analysis.py | 4 ++-- unittests/test_base_table_exporter.py | 4 ++-- unittests/test_cache.py | 4 ++-- unittests/test_caosdbignore.py | 2 +- unittests/test_cfood.py | 10 +++++----- unittests/test_cfoods.py | 2 +- unittests/test_crawler.py | 4 ++-- unittests/test_data_model.py | 4 ++-- unittests/test_generic_analysis.py | 4 ++-- unittests/test_h5.py | 14 +++++++------- unittests/test_json_schema_model_parser.py | 4 ++-- unittests/test_read_md_header.py | 4 ++-- unittests/test_result_table_cfood.py | 4 ++-- unittests/test_scifolder_utils.py | 2 +- unittests/test_sss_helper.py | 6 +++--- unittests/test_structure_mapping.py | 6 +++--- unittests/test_suppressKnown.py | 2 +- unittests/test_table_converter.py | 6 +++--- unittests/test_table_importer.py | 4 ++-- unittests/test_update_cache.py | 4 ++-- unittests/test_utils.py | 8 ++++---- unittests/test_yaml_model_parser.py | 4 ++-- 42 files changed, 118 insertions(+), 118 deletions(-) diff --git a/integrationtests/clear_database.py b/integrationtests/clear_database.py index 362f2e3a..6c6f61c6 100644 --- a/integrationtests/clear_database.py +++ b/integrationtests/clear_database.py @@ -23,7 +23,7 @@ # ** end header # """Clear the database before and after the integration tests.""" -import caosdb as db +import linkahead as db def clear_all(): diff --git a/integrationtests/crawl.py b/integrationtests/crawl.py index 6c29d0b7..77feb851 100755 --- a/integrationtests/crawl.py +++ b/integrationtests/crawl.py @@ -28,11 +28,11 @@ import logging import sys from argparse import RawTextHelpFormatter -import caosdb as db -from caosadvancedtools.cfood import fileguide -from caosadvancedtools.crawler import FileCrawler -from caosadvancedtools.guard import INSERT, UPDATE -from caosadvancedtools.scifolder import (AnalysisCFood, ExperimentCFood, +import linkahead as db +from linkaheadadvancedtools.cfood import fileguide +from linkaheadadvancedtools.crawler import FileCrawler +from linkaheadadvancedtools.guard import INSERT, UPDATE +from linkaheadadvancedtools.scifolder import (AnalysisCFood, ExperimentCFood, PublicationCFood, SimulationCFood, SoftwareCFood, ResultTableCFood) @@ -68,7 +68,7 @@ def access(path): if __name__ == "__main__": - logger = logging.getLogger("caosadvancedtools") + logger = logging.getLogger("linkaheadadvancedtools") logger.addHandler(logging.StreamHandler(sys.stdout)) conlogger = logging.getLogger("connection") conlogger.setLevel(level=logging.ERROR) diff --git a/integrationtests/create_analysis.py b/integrationtests/create_analysis.py index 0d0c91c2..8a767e74 100644 --- a/integrationtests/create_analysis.py +++ b/integrationtests/create_analysis.py @@ -31,12 +31,12 @@ automated analysis pipeline. import sys from datetime import datetime -import caosdb as db +import linkahead as db def main(): script = db.File( - file="../src/caosadvancedtools/serverside/examples/example_script.py", + file="../src/linkaheadadvancedtools/serverside/examples/example_script.py", path=("AutomatedAnalysis/scripts/" + str(datetime.now())+"example_script.py"), ) diff --git a/integrationtests/example_hdf5cfood.py b/integrationtests/example_hdf5cfood.py index dadd94df..4f382f8f 100644 --- a/integrationtests/example_hdf5cfood.py +++ b/integrationtests/example_hdf5cfood.py @@ -27,10 +27,10 @@ An exemplary definition of a HDF5 CFood for integration testing """ -import caosdb as db -from caosadvancedtools.cfoods.h5 import H5CFood -from caosadvancedtools.scifolder import ExperimentCFood -from caosadvancedtools.scifolder.generic_pattern import readme_pattern +import linkahead as db +from linkaheadadvancedtools.cfoods.h5 import H5CFood +from linkaheadadvancedtools.scifolder import ExperimentCFood +from linkaheadadvancedtools.scifolder.generic_pattern import readme_pattern class ExampleH5CFood(H5CFood): diff --git a/integrationtests/filldb.sh b/integrationtests/filldb.sh index 9ee9060e..9c45d5fd 100755 --- a/integrationtests/filldb.sh +++ b/integrationtests/filldb.sh @@ -1,11 +1,11 @@ #!/bin/bash # fill database -python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/ExperimentalData -python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/DataAnalysis -python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/SimulationData -python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/Publications -python3 -m caosadvancedtools.loadFiles -c caosdbignore -l $PWD/extroot/Software /opt/caosdb/mnt/extroot/Software +python3 -m linkaheadadvancedtools.loadFiles /opt/linkahead/mnt/extroot/ExperimentalData +python3 -m linkaheadadvancedtools.loadFiles /opt/linkahead/mnt/extroot/DataAnalysis +python3 -m linkaheadadvancedtools.loadFiles /opt/linkahead/mnt/extroot/SimulationData +python3 -m linkaheadadvancedtools.loadFiles /opt/linkahead/mnt/extroot/Publications +python3 -m linkaheadadvancedtools.loadFiles -c caosdbignore -l $PWD/extroot/Software /opt/linkahead/mnt/extroot/Software python3 insert_model.py python3 insert_some.py python3 crawl.py / diff --git a/integrationtests/insert_model.py b/integrationtests/insert_model.py index 26bf478c..1d2b2ce2 100755 --- a/integrationtests/insert_model.py +++ b/integrationtests/insert_model.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 -import caosdb as db +import linkahead as db import h5py -from caosadvancedtools.cfoods.h5 import H5CFood -from caosadvancedtools.models.data_model import DataModel -from caosadvancedtools.models.parser import parse_model_from_yaml +from linkaheadadvancedtools.cfoods.h5 import H5CFood +from linkaheadadvancedtools.models.data_model import DataModel +from linkaheadadvancedtools.models.parser import parse_model_from_yaml def main(): diff --git a/integrationtests/insert_some.py b/integrationtests/insert_some.py index cf16a45d..2fbc9d0f 100644 --- a/integrationtests/insert_some.py +++ b/integrationtests/insert_some.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import caosdb as db -from caosadvancedtools.scifolder.experiment_cfood import dm +import linkahead as db +from linkaheadadvancedtools.scifolder.experiment_cfood import dm # This inserts two identifiables. When no dependencies are possible among # identifiables, it should not be possible to find both: the experiment diff --git a/integrationtests/test.sh b/integrationtests/test.sh index 9f8d003c..e5a87ae0 100755 --- a/integrationtests/test.sh +++ b/integrationtests/test.sh @@ -16,8 +16,8 @@ fi OUT=/tmp/crawler.output ls cat pycaosdb.ini -python3 -c "import caosdb; print('CaosDB Version:', caosdb.__version__)" -rm -rf /tmp/caosdb_identifiable_cache.db +python3 -c "import linkahead; print('CaosDB Version:', caosdb.__version__)" +rm -rf /tmp/linkahead_identifiable_cache.db set -e echo "Clearing database" python3 clear_database.py @@ -76,7 +76,7 @@ python3 test_im_und_export.py # automated analysis # for some reason the loadFiles of sim data has to be called again -python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/SimulationData +python3 -m linkaheadadvancedtools.loadFiles /opt/linkahead/mnt/extroot/SimulationData python3 create_analysis.py # Better safe than sorry: diff --git a/integrationtests/test_assure_functions.py b/integrationtests/test_assure_functions.py index d545bbb5..4226520b 100644 --- a/integrationtests/test_assure_functions.py +++ b/integrationtests/test_assure_functions.py @@ -21,14 +21,14 @@ # 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/>. """Integration tests for the `assure_...` functions from -`caosadvancedtools.cfood`. They mainly test the in-place updates when +`linkaheadadvancedtools.cfood`. They mainly test the in-place updates when no `to_be_updated` is specified. """ -import caosdb as db +import linkahead as db -from caosadvancedtools.cfood import (assure_object_is_in_list) -from caosadvancedtools.guard import (global_guard, RETRIEVE, UPDATE) +from linkaheadadvancedtools.cfood import (assure_object_is_in_list) +from linkaheadadvancedtools.guard import (global_guard, RETRIEVE, UPDATE) def setup(): @@ -92,7 +92,7 @@ def test_assure_list_in_place(): def test_add_to_empty_list(): - """See https://gitlab.com/caosdb/caosdb-advanced-user-tools/-/issues/40.""" + """See https://gitlab.com/linkahead/linkahead-advanced-user-tools/-/issues/40.""" # @author Florian Spreckelsen # @date 2022-04-19 referenced_rt = db.RecordType(name="TestReferencedType").insert() diff --git a/integrationtests/test_base_table_exporter_integration.py b/integrationtests/test_base_table_exporter_integration.py index af1bb333..907b0c4c 100644 --- a/integrationtests/test_base_table_exporter_integration.py +++ b/integrationtests/test_base_table_exporter_integration.py @@ -22,9 +22,9 @@ # # ** end header # -import caosdb as db +import linkahead as db import pytest -from caosadvancedtools import table_export as te +from linkaheadadvancedtools import table_export as te class IntegrationExporter(te.BaseTableExporter): diff --git a/integrationtests/test_cache.py b/integrationtests/test_cache.py index 7456b8e5..0514b21b 100644 --- a/integrationtests/test_cache.py +++ b/integrationtests/test_cache.py @@ -26,8 +26,8 @@ import os import unittest from tempfile import NamedTemporaryFile -import caosdb as db -from caosadvancedtools.cache import UpdateCache +import linkahead as db +from linkaheadadvancedtools.cache import UpdateCache class CacheTest(unittest.TestCase): diff --git a/integrationtests/test_crawl_with_datamodel_problems.py b/integrationtests/test_crawl_with_datamodel_problems.py index 18bd4e52..acf47b92 100644 --- a/integrationtests/test_crawl_with_datamodel_problems.py +++ b/integrationtests/test_crawl_with_datamodel_problems.py @@ -25,14 +25,14 @@ """ -import caosdb as db -from caosadvancedtools import loadFiles -from caosadvancedtools.cfood import fileguide -from caosadvancedtools.crawler import FileCrawler -from caosadvancedtools.datamodel_problems import DataModelProblems -from caosadvancedtools.guard import INSERT -from caosadvancedtools.models.parser import parse_model_from_yaml -from caosadvancedtools.scifolder import (AnalysisCFood, ExperimentCFood, +import linkahead as db +from linkaheadadvancedtools import loadFiles +from linkaheadadvancedtools.cfood import fileguide +from linkaheadadvancedtools.crawler import FileCrawler +from linkaheadadvancedtools.datamodel_problems import DataModelProblems +from linkaheadadvancedtools.guard import INSERT +from linkaheadadvancedtools.models.parser import parse_model_from_yaml +from linkaheadadvancedtools.scifolder import (AnalysisCFood, ExperimentCFood, PublicationCFood, SimulationCFood) from insert_model import main as insert_model @@ -60,7 +60,7 @@ def teardown(): def test_crawler_with_data_model_problems(): """Test whether data model problems are found correctly.""" # load the files - basepath = "/opt/caosdb/mnt/extroot/" + basepath = "/opt/linkahead/mnt/extroot/" pathlist = [basepath+dirname for dirname in ["ExperimentalData", "DataAnalysis", "SimulationData", "Publications"]] diff --git a/integrationtests/test_crawler_basics.py b/integrationtests/test_crawler_basics.py index 98ca228e..f93be901 100644 --- a/integrationtests/test_crawler_basics.py +++ b/integrationtests/test_crawler_basics.py @@ -29,11 +29,11 @@ cfoods. This is tested in test_crawler_with_cfoods.py. """ import unittest -import caosdb as db +import linkahead as db -from caosadvancedtools.crawler import Crawler -from caosadvancedtools.guard import INSERT -from caosadvancedtools.guard import global_guard as guard +from linkaheadadvancedtools.crawler import Crawler +from linkaheadadvancedtools.guard import INSERT +from linkaheadadvancedtools.guard import global_guard as guard def setup_module(): diff --git a/integrationtests/test_crawler_with_cfoods.py b/integrationtests/test_crawler_with_cfoods.py index dc427227..801bf4b3 100755 --- a/integrationtests/test_crawler_with_cfoods.py +++ b/integrationtests/test_crawler_with_cfoods.py @@ -25,7 +25,7 @@ import os import unittest -import caosdb as db +import linkahead as db from caosdb.apiutils import retrieve_entity_with_id diff --git a/integrationtests/test_data_model.py b/integrationtests/test_data_model.py index 5bf168cd..47e249c3 100644 --- a/integrationtests/test_data_model.py +++ b/integrationtests/test_data_model.py @@ -1,7 +1,7 @@ import unittest -import caosdb as db -from caosadvancedtools.models.data_model import DataModel +import linkahead as db +from linkaheadadvancedtools.models.data_model import DataModel class DataModelTest(unittest.TestCase): diff --git a/integrationtests/test_datamodel_problems.py b/integrationtests/test_datamodel_problems.py index a7eb1a26..5c316b7b 100644 --- a/integrationtests/test_datamodel_problems.py +++ b/integrationtests/test_datamodel_problems.py @@ -27,9 +27,9 @@ during crawling that tests the integrations of the DataModelProblems class in crawler.py and cfood.py can be found in full-tests. """ -import caosdb as db +import linkahead as db import pytest -from caosadvancedtools.datamodel_problems import DataModelProblems +from linkaheadadvancedtools.datamodel_problems import DataModelProblems from caosdb.exceptions import (TransactionError, UnqualifiedParentsError, UnqualifiedPropertiesError) diff --git a/integrationtests/test_im_und_export.py b/integrationtests/test_im_und_export.py index 407faa1a..f7c065ca 100644 --- a/integrationtests/test_im_und_export.py +++ b/integrationtests/test_im_und_export.py @@ -2,9 +2,9 @@ import os from tempfile import TemporaryDirectory -import caosdb as db -from caosadvancedtools.export_related import export_related_to -from caosadvancedtools.import_from_xml import import_xml +import linkahead as db +from linkaheadadvancedtools.export_related import export_related_to +from linkaheadadvancedtools.import_from_xml import import_xml if __name__ == "__main__": print("Conducting im- and export tests") diff --git a/integrationtests/test_json_schema_datamodel_parser.py b/integrationtests/test_json_schema_datamodel_parser.py index 04af1570..7267a197 100644 --- a/integrationtests/test_json_schema_datamodel_parser.py +++ b/integrationtests/test_json_schema_datamodel_parser.py @@ -20,8 +20,8 @@ import os -import caosdb as db -from caosadvancedtools.models.parser import parse_model_from_json_schema +import linkahead as db +from linkaheadadvancedtools.models.parser import parse_model_from_json_schema def _clear_db(): diff --git a/integrationtests/test_table.py b/integrationtests/test_table.py index b222c264..59b12a9e 100644 --- a/integrationtests/test_table.py +++ b/integrationtests/test_table.py @@ -20,14 +20,14 @@ import logging -import caosdb as db +import linkahead as db import pandas as pd -from caosadvancedtools.crawler import TableCrawler -from caosadvancedtools.guard import UPDATE +from linkaheadadvancedtools.crawler import TableCrawler +from linkaheadadvancedtools.guard import UPDATE if __name__ == "__main__": - logger = logging.getLogger("caosadvancedtools") + logger = logging.getLogger("linkaheadadvancedtools") conlogger = logging.getLogger("connection") conlogger.setLevel(level=logging.ERROR) logger.setLevel(level=logging.DEBUG) diff --git a/integrationtests/test_yaml_parser.py b/integrationtests/test_yaml_parser.py index e5656bcf..3c8d019c 100644 --- a/integrationtests/test_yaml_parser.py +++ b/integrationtests/test_yaml_parser.py @@ -19,8 +19,8 @@ # with this program. If not, see <https://www.gnu.org/licenses/>. # -import caosdb as db -from caosadvancedtools.models.parser import parse_model_from_string +import linkahead as db +from linkaheadadvancedtools.models.parser import parse_model_from_string def _delete_everything(): diff --git a/integrationtests/update_analysis.py b/integrationtests/update_analysis.py index 4edbe101..12d8ba2a 100644 --- a/integrationtests/update_analysis.py +++ b/integrationtests/update_analysis.py @@ -34,8 +34,8 @@ entities that where changed within a certain period of time. import sys -import caosdb as db -from caosadvancedtools.serverside.generic_analysis import run +import linkahead as db +from linkaheadadvancedtools.serverside.generic_analysis import run def main(): diff --git a/unittests/test_base_table_exporter.py b/unittests/test_base_table_exporter.py index d3b91ca3..e82bf2ca 100644 --- a/unittests/test_base_table_exporter.py +++ b/unittests/test_base_table_exporter.py @@ -28,9 +28,9 @@ tested without db connection. """ import json import os -import caosdb as db +import linkahead as db from pytest import raises -from caosadvancedtools import table_export as te +from linkaheadadvancedtools import table_export as te class DummyExporter(te.BaseTableExporter): diff --git a/unittests/test_cache.py b/unittests/test_cache.py index 9e11acc0..848fafdc 100644 --- a/unittests/test_cache.py +++ b/unittests/test_cache.py @@ -26,8 +26,8 @@ from copy import deepcopy from tempfile import NamedTemporaryFile import sqlite3 -import caosdb as db -from caosadvancedtools.cache import IdentifiableCache, cleanXML +import linkahead as db +from linkaheadadvancedtools.cache import IdentifiableCache, cleanXML from lxml import etree import pytest diff --git a/unittests/test_caosdbignore.py b/unittests/test_caosdbignore.py index 77ce236b..d017b308 100644 --- a/unittests/test_caosdbignore.py +++ b/unittests/test_caosdbignore.py @@ -29,7 +29,7 @@ import re from tempfile import NamedTemporaryFile import unittest -from caosadvancedtools.loadFiles import compile_file_list, create_re_for_file_list, combine_ignore_files +from linkaheadadvancedtools.loadFiles import compile_file_list, create_re_for_file_list, combine_ignore_files BASEDIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/unittests/test_cfood.py b/unittests/test_cfood.py index 6c790d5b..ebb7010c 100644 --- a/unittests/test_cfood.py +++ b/unittests/test_cfood.py @@ -24,15 +24,15 @@ import re import unittest -import caosdb as db -from caosadvancedtools.cfood import (AbstractCFood, AbstractFileCFood, CMeal, +import linkahead as db +from linkaheadadvancedtools.cfood import (AbstractCFood, AbstractFileCFood, CMeal, assure_has_parent, assure_has_property, assure_object_is_in_list, assure_parents_are, assure_property_is, get_entity_for_path) -from caosadvancedtools.crawler import FileCrawler -from caosadvancedtools.example_cfood import ExampleCFood -from caosdb.common.models import _parse_single_xml_element +from linkaheadadvancedtools.crawler import FileCrawler +from linkaheadadvancedtools.example_cfood import ExampleCFood +from linkahead.common.models import _parse_single_xml_element from lxml import etree from datetime import datetime, timezone diff --git a/unittests/test_cfoods.py b/unittests/test_cfoods.py index 87e6d6d2..a6dada02 100644 --- a/unittests/test_cfoods.py +++ b/unittests/test_cfoods.py @@ -18,7 +18,7 @@ import os import unittest -from caosadvancedtools.scifolder import (AnalysisCFood, ExperimentCFood, +from linkaheadadvancedtools.scifolder import (AnalysisCFood, ExperimentCFood, PublicationCFood, SimulationCFood) data_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), diff --git a/unittests/test_crawler.py b/unittests/test_crawler.py index eb5c9b9a..0828596c 100644 --- a/unittests/test_crawler.py +++ b/unittests/test_crawler.py @@ -23,8 +23,8 @@ import re import unittest -import caosdb as db -from caosadvancedtools.crawler import Crawler +import linkahead as db +from linkaheadadvancedtools.crawler import Crawler class CrawlerTest(unittest.TestCase): diff --git a/unittests/test_data_model.py b/unittests/test_data_model.py index 159adfca..44a5857b 100644 --- a/unittests/test_data_model.py +++ b/unittests/test_data_model.py @@ -1,7 +1,7 @@ import unittest -import caosdb as db -from caosadvancedtools.models.data_model import DataModel +import linkahead as db +from linkaheadadvancedtools.models.data_model import DataModel class DataModelTest(unittest.TestCase): diff --git a/unittests/test_generic_analysis.py b/unittests/test_generic_analysis.py index 79410ad9..f9060b2a 100644 --- a/unittests/test_generic_analysis.py +++ b/unittests/test_generic_analysis.py @@ -27,8 +27,8 @@ module description """ -import caosdb as db -from caosadvancedtools.serverside.generic_analysis import \ +import linkahead as db +from linkaheadadvancedtools.serverside.generic_analysis import \ check_referenced_script from test_utils import BaseMockUpTest diff --git a/unittests/test_h5.py b/unittests/test_h5.py index 360d4b28..67b0ea45 100644 --- a/unittests/test_h5.py +++ b/unittests/test_h5.py @@ -1,12 +1,12 @@ import unittest from tempfile import NamedTemporaryFile -import caosdb as db -import caosdb.apiutils +import linkahead as db +import linkahead.apiutils import h5py import numpy as np -from caosadvancedtools.cfoods import h5 -from caosadvancedtools.cfoods.h5 import h5_attr_to_property +from linkaheadadvancedtools.cfoods import h5 +from linkaheadadvancedtools.cfoods.h5 import h5_attr_to_property from create_dummy_hdf5file import create_hdf5_file @@ -77,8 +77,8 @@ class H5CFoodTest(unittest.TestCase): # TODO this does probably break the code: The function will not be # restored correctly. # Change it to use the BaseMockUpTest - real_retrieve = caosdb.apiutils.retrieve_entity_with_id - caosdb.apiutils.retrieve_entity_with_id = dummy_get + real_retrieve = linkahead.apiutils.retrieve_entity_with_id + linkahead.apiutils.retrieve_entity_with_id = dummy_get # should run without problem h5.collect_existing_structure(db.Record(), db.Record(id=234), h5.EntityMapping()) @@ -151,7 +151,7 @@ class H5CFoodTest(unittest.TestCase): self.assertEqual(em.to_existing[r_child2._cuid], ENTS[101]) self.assertEqual(em.to_target[101], r_child2) - caosdb.apiutils.retrieve_entity_with_id = real_retrieve + linkahead.apiutils.retrieve_entity_with_id = real_retrieve def test_h5_attr_to_property(self): diff --git a/unittests/test_json_schema_model_parser.py b/unittests/test_json_schema_model_parser.py index 22308466..96b1076a 100644 --- a/unittests/test_json_schema_model_parser.py +++ b/unittests/test_json_schema_model_parser.py @@ -24,8 +24,8 @@ import os import pytest -import caosdb as db -from caosadvancedtools.models.parser import (parse_model_from_json_schema, +import linkahead as db +from linkaheadadvancedtools.models.parser import (parse_model_from_json_schema, JsonSchemaDefinitionError) FILEPATH = os.path.join(os.path.dirname( diff --git a/unittests/test_read_md_header.py b/unittests/test_read_md_header.py index bf892353..55fbeff3 100644 --- a/unittests/test_read_md_header.py +++ b/unittests/test_read_md_header.py @@ -25,8 +25,8 @@ import unittest from copy import deepcopy from tempfile import NamedTemporaryFile -import caosdb as db -from caosadvancedtools.read_md_header import get_header +import linkahead as db +from linkaheadadvancedtools.read_md_header import get_header def to_file(string): diff --git a/unittests/test_result_table_cfood.py b/unittests/test_result_table_cfood.py index 9fa2d501..be141d4e 100644 --- a/unittests/test_result_table_cfood.py +++ b/unittests/test_result_table_cfood.py @@ -32,8 +32,8 @@ import os import re import unittest -import caosdb as db -from caosadvancedtools.scifolder.result_table_cfood import ResultTableCFood +import linkahead as db +from linkaheadadvancedtools.scifolder.result_table_cfood import ResultTableCFood class CFoodTest(unittest.TestCase): diff --git a/unittests/test_scifolder_utils.py b/unittests/test_scifolder_utils.py index 30e211d9..8b4cb32b 100644 --- a/unittests/test_scifolder_utils.py +++ b/unittests/test_scifolder_utils.py @@ -20,7 +20,7 @@ import os import unittest -from caosadvancedtools.scifolder.utils import get_xls_header +from linkaheadadvancedtools.scifolder.utils import get_xls_header class XLSTest(unittest.TestCase): diff --git a/unittests/test_sss_helper.py b/unittests/test_sss_helper.py index 71408fa6..ea1cf824 100644 --- a/unittests/test_sss_helper.py +++ b/unittests/test_sss_helper.py @@ -3,13 +3,13 @@ from email import message_from_file, policy from os import listdir, remove from os.path import abspath, dirname, exists, isfile, join -import caosdb as db -from caosadvancedtools.serverside.helper import (NameCollector, get_data, +import linkahead as db +from linkaheadadvancedtools.serverside.helper import (NameCollector, get_data, get_file_via_download, init_data_model, parse_arguments, send_mail) from caosdb import RecordType, configure_connection, get_config -from caosdb.connection.mockup import MockUpResponse, MockUpServerConnection +from linkahead.connection.mockup import MockUpResponse, MockUpServerConnection from pytest import mark, raises diff --git a/unittests/test_structure_mapping.py b/unittests/test_structure_mapping.py index 4cb88097..95d9688b 100644 --- a/unittests/test_structure_mapping.py +++ b/unittests/test_structure_mapping.py @@ -22,10 +22,10 @@ import unittest from os import name -import caosdb as db -from caosadvancedtools.structure_mapping import (EntityMapping, +import linkahead as db +from linkaheadadvancedtools.structure_mapping import (EntityMapping, collect_existing_structure) -from caosdb.common import datatype +from linkahead.common import datatype class structureMappingTest(unittest.TestCase): diff --git a/unittests/test_suppressKnown.py b/unittests/test_suppressKnown.py index d2008e27..0b8b4b2d 100644 --- a/unittests/test_suppressKnown.py +++ b/unittests/test_suppressKnown.py @@ -27,7 +27,7 @@ import os import unittest from tempfile import NamedTemporaryFile -from caosadvancedtools.suppressKnown import SuppressKnown +from linkaheadadvancedtools.suppressKnown import SuppressKnown class Record(object): diff --git a/unittests/test_table_converter.py b/unittests/test_table_converter.py index 13239349..907408d5 100644 --- a/unittests/test_table_converter.py +++ b/unittests/test_table_converter.py @@ -24,11 +24,11 @@ import os import unittest from tempfile import NamedTemporaryFile -import caosdb as db +import linkahead as db import pandas as pd -from caosdb.apiutils import compare_entities +from linkahead.apiutils import compare_entities -from caosadvancedtools.table_converter import (from_table, from_tsv, to_table, +from linkaheadadvancedtools.table_converter import (from_table, from_tsv, to_table, to_tsv) TEST_TABLE = os.path.join(os.path.dirname(os.path.realpath(__file__)), diff --git a/unittests/test_table_importer.py b/unittests/test_table_importer.py index 0b3f0d7c..1aec7d1a 100644 --- a/unittests/test_table_importer.py +++ b/unittests/test_table_importer.py @@ -26,8 +26,8 @@ from tempfile import NamedTemporaryFile import numpy as np import pandas as pd import pytest -from caosadvancedtools.datainconsistency import DataInconsistencyError -from caosadvancedtools.table_importer import (CSVImporter, TableImporter, +from linkaheadadvancedtools.datainconsistency import DataInconsistencyError +from linkaheadadvancedtools.table_importer import (CSVImporter, TableImporter, TSVImporter, XLSImporter, assure_name_format, check_reference_field, diff --git a/unittests/test_update_cache.py b/unittests/test_update_cache.py index bee8a190..9e50e1f0 100644 --- a/unittests/test_update_cache.py +++ b/unittests/test_update_cache.py @@ -26,8 +26,8 @@ import unittest from copy import deepcopy from tempfile import NamedTemporaryFile -import caosdb as db -from caosadvancedtools.cache import UpdateCache, get_pretty_xml +import linkahead as db +from linkaheadadvancedtools.cache import UpdateCache, get_pretty_xml class CacheTest(unittest.TestCase): diff --git a/unittests/test_utils.py b/unittests/test_utils.py index 35487c07..b831865c 100644 --- a/unittests/test_utils.py +++ b/unittests/test_utils.py @@ -24,12 +24,12 @@ import logging import unittest from tempfile import NamedTemporaryFile -import caosdb as db -from caosadvancedtools.utils import (check_win_path, get_referenced_files, +import linkahead as db +from linkaheadadvancedtools.utils import (check_win_path, get_referenced_files, string_to_person, create_entity_link) from caosdb import RecordType, configure_connection, get_config -from caosdb.connection.mockup import MockUpResponse, MockUpServerConnection -from caosdb.exceptions import TransactionError +from linkahead.connection.mockup import MockUpResponse, MockUpServerConnection +from linkahead.exceptions import TransactionError class BaseMockUpTest(unittest.TestCase): diff --git a/unittests/test_yaml_model_parser.py b/unittests/test_yaml_model_parser.py index 6cdea792..23a3f823 100644 --- a/unittests/test_yaml_model_parser.py +++ b/unittests/test_yaml_model_parser.py @@ -3,8 +3,8 @@ from datetime import date from tempfile import NamedTemporaryFile from pytest import deprecated_call, raises -import caosdb as db -from caosadvancedtools.models.parser import (TwiceDefinedException, +import linkahead as db +from linkaheadadvancedtools.models.parser import (TwiceDefinedException, YamlDefinitionError, parse_model_from_string, parse_model_from_yaml) -- GitLab