Skip to content
Snippets Groups Projects
Commit dbd18de1 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-linkahead-rename-2024-11' into 'dev'

New LinkAhead rename

See merge request !121
parents 178c434c 472799d9
No related branches found
No related tags found
2 merge requests!128MNT: Added a warning when column metadata is not configured, and a better...,!121New LinkAhead rename
Pipeline #57847 passed
Showing
with 37 additions and 32 deletions
#!/bin/bash #!/bin/bash
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2019 Daniel Hornung, Göttingen # Copyright (C) 2019 Daniel Hornung, Göttingen
# #
......
# #
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2018 Research Group Biomedical Physics, # Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
......
...@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### ### Changed ###
- Using the official name "LinkAhead" wherever possible without large effort. This includes the
following exposed names / features:
- `models.data_model.LINKAHEAD_INTERNAL_PROPERTIES`
- `export_related.export` exports to `linkahead_data.xml` now.
### Deprecated ### ### Deprecated ###
### Removed ### ### Removed ###
......
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2020 IndiScale GmbH <info@indiscale.com> # Copyright (C) 2020 IndiScale GmbH <info@indiscale.com>
# Copyright (C) 2020 Daniel Hornung <d.hornung@indiscale.com> # Copyright (C) 2020 Daniel Hornung <d.hornung@indiscale.com>
......
# Release Guidelines for the CaosDB Python Client Library # Release Guidelines for the CaosDB Python Client Library
This document specifies release guidelines in addition to the general release This document specifies release guidelines in addition to the general release
guidelines of the CaosDB Project guidelines of the LinkAhead project
([RELEASE_GUIDELINES.md](https://gitlab.com/caosdb/caosdb/blob/dev/RELEASE_GUIDELINES.md)) ([RELEASE_GUIDELINES.md](https://gitlab.com/caosdb/caosdb/blob/dev/RELEASE_GUIDELINES.md))
## General Prerequisites ## General Prerequisites
......
# -*- mode: snippet -*- # -*- mode: snippet -*-
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2022 IndiScale GmbH <info@indiscale.com> # Copyright (C) 2022 IndiScale GmbH <info@indiscale.com>
# Copyright (C) 2022 Daniel Hornung <d.hornung@indiscale.com> # Copyright (C) 2022 Daniel Hornung <d.hornung@indiscale.com>
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2020 Indiscale GmbH <info@indiscale.com> # Copyright (C) 2020 Indiscale GmbH <info@indiscale.com>
# Copyright (C) 2020 Florian Spreckelsen <f.spreckelsen@indiscale.com> # Copyright (C) 2020 Florian Spreckelsen <f.spreckelsen@indiscale.com>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# ** end header # ** end header
# #
"""Clear the database before and after the integration tests.""" """Clear the database before and after the integration tests."""
import caosdb as db import linkahead as db
def clear_all(): def clear_all():
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2018 Research Group Biomedical Physics, # Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
...@@ -28,7 +28,7 @@ import logging ...@@ -28,7 +28,7 @@ import logging
import sys import sys
from argparse import RawTextHelpFormatter from argparse import RawTextHelpFormatter
import caosdb as db import linkahead as db
from caosadvancedtools.cfood import fileguide from caosadvancedtools.cfood import fileguide
from caosadvancedtools.crawler import FileCrawler from caosadvancedtools.crawler import FileCrawler
from caosadvancedtools.guard import INSERT, UPDATE from caosadvancedtools.guard import INSERT, UPDATE
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2021 Indiscale GmbH <info@indiscale.com> # Copyright (C) 2021 Indiscale GmbH <info@indiscale.com>
# Copyright (C) 2021 Henrik tom Wörden <h.tomwoerden@indiscale.com> # Copyright (C) 2021 Henrik tom Wörden <h.tomwoerden@indiscale.com>
...@@ -31,7 +31,7 @@ automated analysis pipeline. ...@@ -31,7 +31,7 @@ automated analysis pipeline.
import sys import sys
from datetime import datetime from datetime import datetime
import caosdb as db import linkahead as db
def main(): def main():
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2021 IndiScale GmbH <www.indiscale.com> # Copyright (C) 2021 IndiScale GmbH <www.indiscale.com>
# Copyright (C) 2021 Henrik tom Wörden <h.tomwoerden@indiscale.com> # Copyright (C) 2021 Henrik tom Wörden <h.tomwoerden@indiscale.com>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
An exemplary definition of a HDF5 CFood for integration testing An exemplary definition of a HDF5 CFood for integration testing
""" """
import caosdb as db import linkahead as db
from caosadvancedtools.cfoods.h5 import H5CFood from caosadvancedtools.cfoods.h5 import H5CFood
from caosadvancedtools.scifolder import ExperimentCFood from caosadvancedtools.scifolder import ExperimentCFood
from caosadvancedtools.scifolder.generic_pattern import readme_pattern from caosadvancedtools.scifolder.generic_pattern import readme_pattern
......
#!/usr/bin/env python3 #!/usr/bin/env python3
import caosdb as db import linkahead as db
import h5py import h5py
from caosadvancedtools.cfoods.h5 import H5CFood from caosadvancedtools.cfoods.h5 import H5CFood
from caosadvancedtools.models.data_model import DataModel from caosadvancedtools.models.data_model import DataModel
......
#!/usr/bin/env python3 #!/usr/bin/env python3
import caosdb as db import linkahead as db
from caosadvancedtools.scifolder.experiment_cfood import dm from caosadvancedtools.scifolder.experiment_cfood import dm
# This inserts two identifiables. When no dependencies are possible among # This inserts two identifiables. When no dependencies are possible among
......
#!/usr/bin/env python #!/usr/bin/env python
# encoding: utf-8 # encoding: utf-8
# #
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2022 IndiScale GmbH <info@indiscale.com> # Copyright (C) 2022 IndiScale GmbH <info@indiscale.com>
# Copyright (C) 2021 University Medical Center Göttingen, Institute for Medical Informatics # Copyright (C) 2021 University Medical Center Göttingen, Institute for Medical Informatics
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
no `to_be_updated` is specified. 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.cfood import (assure_object_is_in_list)
from caosadvancedtools.guard import (global_guard, RETRIEVE, UPDATE) from caosadvancedtools.guard import (global_guard, RETRIEVE, UPDATE)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2020 Indiscale GmbH <info@indiscale.com> # Copyright (C) 2020 Indiscale GmbH <info@indiscale.com>
# Copyright (C) 2020 Florian Sprecklelsen <f.spreckelsen@indiscale.com> # Copyright (C) 2020 Florian Sprecklelsen <f.spreckelsen@indiscale.com>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# #
# ** end header # ** end header
# #
import caosdb as db import linkahead as db
import pytest import pytest
from caosadvancedtools import table_export as te from caosadvancedtools import table_export as te
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2020 Indiscale GmbH <info@indiscale.com> # Copyright (C) 2020 Indiscale GmbH <info@indiscale.com>
# Copyright (C) 2020 Florian Spreckelsen <f.spreckelsen@indiscale.com> # Copyright (C) 2020 Florian Spreckelsen <f.spreckelsen@indiscale.com>
...@@ -26,7 +26,7 @@ import os ...@@ -26,7 +26,7 @@ import os
import unittest import unittest
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
import caosdb as db import linkahead as db
from caosadvancedtools.cache import UpdateCache from caosadvancedtools.cache import UpdateCache
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (c) 2020 IndiScale GmbH <info@indiscale.com> # Copyright (c) 2020 IndiScale GmbH <info@indiscale.com>
# Copyright (c) 2020 Florian Spreckelsen <f.spreckelsen@indiscale.com> # Copyright (c) 2020 Florian Spreckelsen <f.spreckelsen@indiscale.com>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
""" """
import caosdb as db import linkahead as db
from caosadvancedtools import loadFiles from caosadvancedtools import loadFiles
from caosadvancedtools.cfood import fileguide from caosadvancedtools.cfood import fileguide
from caosadvancedtools.crawler import FileCrawler from caosadvancedtools.crawler import FileCrawler
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2018 Research Group Biomedical Physics, # Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
...@@ -29,7 +29,7 @@ cfoods. This is tested in test_crawler_with_cfoods.py. ...@@ -29,7 +29,7 @@ cfoods. This is tested in test_crawler_with_cfoods.py.
""" """
import unittest import unittest
import caosdb as db import linkahead as db
from caosadvancedtools.crawler import Crawler from caosadvancedtools.crawler import Crawler
from caosadvancedtools.guard import INSERT from caosadvancedtools.guard import INSERT
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2018 Research Group Biomedical Physics, # Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
import os import os
import unittest import unittest
import caosdb as db import linkahead as db
from caosdb.apiutils import retrieve_entity_with_id from linkahead.apiutils import retrieve_entity_with_id
def get_entity_with_id(eid): def get_entity_with_id(eid):
......
import unittest import unittest
import pytest import pytest
import caosdb as db import linkahead as db
from caosadvancedtools.models.data_model import DataModel from caosadvancedtools.models.data_model import DataModel
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
# #
# ** header v3.0 # ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the LinkAhead project.
# #
# Copyright (C) 2020 Indiscale GmbH <info@indiscale.com> # Copyright (C) 2020 Indiscale GmbH <info@indiscale.com>
# Copyright (C) 2020 Florian Spreckelsen <f.spreckelsen@indiscale.com> # Copyright (C) 2020 Florian Spreckelsen <f.spreckelsen@indiscale.com>
...@@ -27,10 +27,10 @@ during crawling that tests the integrations of the DataModelProblems ...@@ -27,10 +27,10 @@ during crawling that tests the integrations of the DataModelProblems
class in crawler.py and cfood.py can be found in full-tests. class in crawler.py and cfood.py can be found in full-tests.
""" """
import caosdb as db import linkahead as db
import pytest import pytest
from caosadvancedtools.datamodel_problems import DataModelProblems from caosadvancedtools.datamodel_problems import DataModelProblems
from caosdb.exceptions import (TransactionError, from linkahead.exceptions import (TransactionError,
UnqualifiedParentsError, UnqualifiedParentsError,
UnqualifiedPropertiesError) UnqualifiedPropertiesError)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment