Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9deb4e0
refactor; deleted module resources
doctrino Sep 7, 2026
b4f0eca
tests: deleted outdated tests
doctrino Sep 7, 2026
c116b3d
tests: updated build v1 to v2 tests
doctrino Sep 7, 2026
45e30e8
refactor: deleted build v1 commands
doctrino Sep 7, 2026
85fce5e
refactor: one less cognite-sdk import
doctrino Sep 7, 2026
f8cd74e
tests: updated clean tests
doctrino Sep 7, 2026
138e63f
refactor; reorder
doctrino Sep 7, 2026
98c4e99
refactor: delete clean v1
doctrino Sep 7, 2026
8052ad5
tests; update
doctrino Sep 7, 2026
24ef231
Merge remote-tracking branch 'origin/remove-clean-v1' into remove-bui…
doctrino Sep 7, 2026
d783d50
tests: remove tests and start init cleanup
doctrino Sep 7, 2026
57a830b
refactor: deleted builder module
doctrino Sep 7, 2026
7ab1a8e
tests: update python-sdk imports
doctrino Sep 7, 2026
f52f501
refactor: delete data crud
doctrino Sep 7, 2026
c8e2d95
refactor: remove remaining part of crud
doctrino Sep 7, 2026
e8eb3d4
refactor: delete last pandas dependencies
doctrino Sep 7, 2026
f555a20
refactor: drop pandas as a core dependency
doctrino Sep 7, 2026
9052086
tests: update sdk imports
doctrino Sep 7, 2026
c2845da
refactor: delete unused issues
doctrino Sep 7, 2026
fb1cfef
refactor: delete more data classes
doctrino Sep 7, 2026
3dee6a9
refactor: more to delete
doctrino Sep 7, 2026
2440d9f
refactor: delete more
doctrino Sep 7, 2026
dfba9b0
refactor: continue as the code reaper
doctrino Sep 7, 2026
5f6d853
refactor: delete more
doctrino Sep 7, 2026
023b4f4
refactro: more cleanup
doctrino Sep 7, 2026
fc41729
tests: remove tests and start init cleanup
doctrino Sep 7, 2026
0f522c4
refactor: deleted builder module
doctrino Sep 7, 2026
62c2c29
refactor: delete data crud
doctrino Sep 7, 2026
fd5066c
refactor: remove remaining part of crud
doctrino Sep 7, 2026
4c449f9
refactor: delete last pandas dependencies
doctrino Sep 7, 2026
1e836a5
refactor: drop pandas as a core dependency
doctrino Sep 7, 2026
aa1591e
tests: update sdk imports
doctrino Sep 7, 2026
5ac56c3
Merge branch 'main' into remove-dataCRUD
doctrino Sep 8, 2026
ae6af03
Merge branch 'remove-dataCRUD' into remove-unused-data-classes
doctrino Sep 8, 2026
32a5b33
Merge branch 'main' into remove-unused-data-classes
doctrino Sep 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions cognite_toolkit/_cdf_tk/data_classes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,74 +1,35 @@
from ._build_files import BuildDestinationFile, BuildSourceFile
from ._build_variables import BuildVariable, BuildVariables
from ._built_modules import (
BuiltModule,
BuiltModuleList,
)
from ._built_resources import (
BuiltFullResourceList,
BuiltResource,
BuiltResourceFull,
BuiltResourceList,
SourceLocation,
SourceLocationEager,
SourceLocationLazy,
)
from ._config_yaml import (
BuildConfigYAML,
BuildEnvironment,
ConfigEntry,
ConfigYAMLs,
Environment,
InitConfigYAML,
)
from ._deploy_results import (
DatapointDeployResult,
DeployResult,
DeployResults,
ResourceContainerDeployResult,
ResourceDeployResult,
UploadDeployResult,
)
from ._issues import Issue, IssueList
from ._module_directories import ModuleDirectories, ModuleLocation
from ._packages import Package, Packages
from ._tracking_info import CommandTracking, DeploymentTracking, TrackingEvent
from ._yaml_comments import YAMLComments

__all__ = [
"BuildConfigYAML",
"BuildDestinationFile",
"BuildEnvironment",
"BuildSourceFile",
"BuildVariable",
"BuildVariables",
"BuiltFullResourceList",
"BuiltModule",
"BuiltModuleList",
"BuiltResource",
"BuiltResourceFull",
"BuiltResourceList",
"CommandTracking",
"ConfigEntry",
"ConfigYAMLs",
"DatapointDeployResult",
"DeployResult",
"DeployResults",
"DeploymentTracking",
"Environment",
"InitConfigYAML",
"Issue",
"IssueList",
"ModuleDirectories",
"ModuleLocation",
"Package",
"Packages",
"ResourceContainerDeployResult",
"ResourceDeployResult",
"SourceLocation",
"SourceLocationEager",
"SourceLocationLazy",
"TrackingEvent",
"UploadDeployResult",
"YAMLComments",
]
31 changes: 2 additions & 29 deletions cognite_toolkit/_cdf_tk/data_classes/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
from abc import ABC, abstractmethod
from dataclasses import dataclass
from pathlib import Path
from typing import Any, ClassVar, TypeVar
from typing import Any, ClassVar

from cognite_toolkit import _version
from cognite_toolkit._cdf_tk.constants import BUILD_ENVIRONMENT_FILE
from cognite_toolkit._cdf_tk.exceptions import ToolkitFileNotFoundError, ToolkitRequiredValueError, ToolkitVersionError
from cognite_toolkit._cdf_tk.exceptions import ToolkitFileNotFoundError, ToolkitRequiredValueError
from cognite_toolkit._cdf_tk.utils import read_yaml_file

if sys.version_info >= (3, 11):
Expand Down Expand Up @@ -43,28 +41,3 @@ def load_from_directory(cls, organization_dir: Path, build_env: str) -> Self:
@abstractmethod
def load(cls, data: dict[str, Any], build_env: str, filepath: Path) -> Self:
raise NotImplementedError


T_BuildConfig = TypeVar("T_BuildConfig", bound=ConfigCore)


def _load_version_variable(data: dict[str, Any], file_name: str) -> str:
try:
cdf_tk_version: str = data["cdf_toolkit_version"]
except KeyError:
err_msg = f"System variables are missing required field 'cdf_toolkit_version' in {file_name!s}. {{}}"
if file_name == BUILD_ENVIRONMENT_FILE:
raise ToolkitVersionError(
err_msg.format("Rerun `cdf build` to build the modules again and create it correctly.")
)
raise ToolkitVersionError(
err_msg.format("Run `cdf modules upgrade` to initialize the modules again to create a correct file.")
)

if cdf_tk_version != _version.__version__:
raise ToolkitVersionError(
f"The version of the modules ({cdf_tk_version}) does not match the version of the installed CLI "
f"({_version.__version__}). Please either run `cdf modules upgrade` to upgrade the modules OR "
f"run `pip install cognite-toolkit=={cdf_tk_version}` to downgrade cdf-tk CLI."
)
return cdf_tk_version
37 changes: 0 additions & 37 deletions cognite_toolkit/_cdf_tk/data_classes/_build_files.py

This file was deleted.

Loading
Loading