diff --git a/integrationtests/clear_database.py b/integrationtests/clear_database.py index 362f2e3ac165ed8fe75fc61213da94db0bd030ec..6c6f61c6b4b25bd2fa5115a27b43cf67213d9524 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 6c29d0b7d5774f1d6847034343b7ebdcad90ee7c..77feb8512e51c3619fcaa165010307e1d13d9dff 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 0d0c91c2dc18bf75ccf6649d103d9b0617f6c7a2..8a767e74236c48a051a961f0e69322214e2173b9 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 dadd94df21e70e37a2a855de91d91d56a5b63f8e..4f382f8f24a02f648bcdf38a1d493967bb13e02a 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 9ee9060e5078b5d48ea5a9972b8ade119378dbc6..9c45d5fdc6271c619964264c8f56bf7a4f9b6311 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 26bf478cdf0d3709e7c0c086fecf722b8c7f90fa..1d2b2ce2c63ebfd8fa66223a24b538a664365942 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 cf16a45ddf1f95ed261af1d9f18edfa1cbf4b450..2fbc9d0f94e482d3c5d37a17dd5c8fd32064564f 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 9f8d003c9219f7e243fd50c5d846b9a7450b9c7b..e5a87ae06c1a22994538ddf81355db88ba3d4eb1 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 d545bbb546692f83fb621ee73e63f6a1a05ab8f0..4226520bfec1deb932b17f90bf575dfabfcf6227 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 af1bb3336f4269cf956fcee5ea26ae47cbe7b5fb..907b0c4caa1726f2ba08a04101b2fcad03ffb0da 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 7456b8e5a48615eb246cb28a0c140f9b5a4bb8e1..0514b21bcd6eda3900dd7dbfab7fb6631135e50a 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 18bd4e523cd50bb13d9a6eb196c200a14ba1b3c6..acf47b92eea8e6837c7573c81138a02be713dcee 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 98ca228e3885fab6520572243a9b0a2e62bb4e9e..f93be9019b80bfb8e260cfc9d0822b3c23f55418 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 dc427227a18bd09a07a6d6ed75ff19315beb0e16..801bf4b3811c17bfa9d7c4ed86135341caedd608 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 5bf168cd25873975d73cbbaa0249f2fd4c21299b..47e249c3237caaa658a2ed260d112917f0b6d2a1 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 a7eb1a26746df5a8b7d4651d797ec55fc502105c..5c316b7bc83bdcc0a17be5a58023c962c31f0dbf 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 407faa1a1d3eb609ffd01b9c78d74f1c6a9b231b..f7c065ca9d68e837738987d80d3c56ebe634212a 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 04af1570e73287f86f58fa729c99bf2c1e5cf3cf..7267a1976fba1404107f5ed66ec15102bc88dfd0 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 b222c2647bc0925ddb190707b2a1052accd57393..59b12a9e8fdd080607cd9e7861d2027d02a905ec 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 e5656bcf54b2875de7a2890a204c76c0caca81c8..3c8d019ca780864bc853db4c2503742cd08ef365 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 4edbe10162e62a03178e780ff004ce29d218dc6f..12d8ba2a8e939efe04317b1d26007a85d145c3b2 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 d3b91ca399eed9ff840636ad8bc9f3f38a2f2ceb..e82bf2caa7c8a3dd75afcc2aaf97170eb801e4eb 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 9e11acc087694adb640c8f0c6409219e6e052896..848fafdcba92e3faf3344ffad488b5f6e374f46e 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 77ce236bfcfbbfcacdc2a1e9fd917f6a8382b446..d017b308279e940851b4d0ec28f38804d1de7c53 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 6c790d5b5835947abc69133f9b04d6757710931f..ebb7010c803ac78861089a26173154e87be7ab8a 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 87e6d6d2da0254e134def92c098b1568c26863ab..a6dada0226750692b4a50c989c1522b17954a107 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 eb5c9b9aba7a686d9d6dc99f4b6341fbd90be7fb..0828596c1e39092fb81d82923818a5c420750ff9 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 159adfca1d589bb092b6f59110828b5868401e25..44a5857bcdd41252410967657bce949bf81d18ee 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 79410ad9f83250b9bcaa9b484e6d9d776a379dbe..f9060b2a7a174a89fb8c84cebaabfca787e7b43d 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 360d4b28938492d0f2af6d696e39dffb1cc3fead..67b0ea458da69900a08116f3da9fb5ba9c3c482a 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 22308466d444264e70e862815fbb8820996ead5c..96b1076a44c1ba84e3c21307c00efc9f3c3f2da6 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 bf8923532e9b369c42636b08fa58ae5828bbeda9..55fbeff3f11e3512d682ed47bdb1588f9d66ac03 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 9fa2d501d2047dfb5c361b94a7ac320e6b4a009a..be141d4eaba168195816c42f6cd9e35e532bc3d0 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 30e211d9daf8da8f831bff4580efbc63d6bdf6fb..8b4cb32b86328559e6d0cf679f9741769985726e 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 71408fa6e34f17f18a803e00e944ef9105eae311..ea1cf824cef1b6f746312be13bc4cd9ac14fdd3a 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 4cb8809735636dec09315542e0c81f983e1cf66c..95d9688b20e75b8f5e2a01cfab0fefb06ffb6f07 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 d2008e27aed388b60902d46194b64ea9b3eba642..0b8b4b2da8375a2963fe036f964435aa5eee3ffa 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 13239349719a8823dcf19943d542a52cfc06b04e..907408d529fbc1cc21f3e7290b79a809182fbb42 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 0b3f0d7c7fc81b2a9d64e24fb2262c686ea669da..1aec7d1a0b57e6a29b29c0e467aa76de6fc39834 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 bee8a1904e9c3267f4e558b80ffeca0246b6d6aa..9e50e1f0dd4629b9904fb0780b26afbe5d6b8cea 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 35487c07a8d9a7222c96b91606b9ad908851741b..b831865c949820c7f30009d06199c952fe9b723e 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 6cdea7922a8503be082e8947edecd7e8c849730b..23a3f8235d67a119e544abeaa9d6f38924ca3398 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)