Skip to content

Commit 75df631

Browse files
committed
[components] Move dagster-components test component lib to dagster_components.lib.test
1 parent 5a1be5c commit 75df631

File tree

8 files changed

+20
-23
lines changed

8 files changed

+20
-23
lines changed

python_modules/libraries/dagster-components/dagster_components/cli/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from dagster_components.cli.generate import generate_cli
55
from dagster_components.cli.list import list_cli
6-
from dagster_components.core.component import BUILTIN_PUBLISHED_COMPONENT_ENTRY_POINT
6+
from dagster_components.core.component import BUILTIN_MAIN_COMPONENT_ENTRY_POINT
77
from dagster_components.utils import CLI_BUILTIN_COMPONENT_LIB_KEY
88

99

@@ -20,7 +20,7 @@ def create_dagster_components_cli():
2020
@click.option(
2121
"--builtin-component-lib",
2222
type=str,
23-
default=BUILTIN_PUBLISHED_COMPONENT_ENTRY_POINT,
23+
default=BUILTIN_MAIN_COMPONENT_ENTRY_POINT,
2424
help="Specify the builitin component library to load.",
2525
)
2626
@click.version_option(__version__, "--version", "-v")

python_modules/libraries/dagster-components/dagster_components/core/component.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
from typing_extensions import Self
3333

3434
from dagster_components.core.component_rendering import TemplatedValueResolver, preprocess_value
35-
from dagster_components.utils import ensure_dagster_components_tests_import
3635

3736

3837
class ComponentDeclNode: ...
@@ -119,14 +118,14 @@ def get_entry_points_from_python_environment(group: str) -> Sequence[importlib.m
119118

120119
COMPONENTS_ENTRY_POINT_GROUP = "dagster.components"
121120
BUILTIN_COMPONENTS_ENTRY_POINT_BASE = "dagster_components"
122-
BUILTIN_PUBLISHED_COMPONENT_ENTRY_POINT = BUILTIN_COMPONENTS_ENTRY_POINT_BASE
121+
BUILTIN_MAIN_COMPONENT_ENTRY_POINT = BUILTIN_COMPONENTS_ENTRY_POINT_BASE
123122
BUILTIN_TEST_COMPONENT_ENTRY_POINT = ".".join([BUILTIN_COMPONENTS_ENTRY_POINT_BASE, "test"])
124123

125124

126125
class ComponentRegistry:
127126
@classmethod
128127
def from_entry_point_discovery(
129-
cls, builtin_component_lib: str = BUILTIN_PUBLISHED_COMPONENT_ENTRY_POINT
128+
cls, builtin_component_lib: str = BUILTIN_MAIN_COMPONENT_ENTRY_POINT
130129
) -> "ComponentRegistry":
131130
"""Discover components registered in the Python environment via the `dagster_components` entry point group.
132131
@@ -149,11 +148,6 @@ def from_entry_point_discovery(
149148
and not entry_point.name == builtin_component_lib
150149
):
151150
continue
152-
elif entry_point.name == BUILTIN_TEST_COMPONENT_ENTRY_POINT:
153-
if builtin_component_lib:
154-
ensure_dagster_components_tests_import()
155-
else:
156-
continue
157151

158152
root_module = entry_point.load()
159153
if not isinstance(root_module, ModuleType):
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from dagster_components.lib.test.all_metadata_empty_asset import (
2+
AllMetadataEmptyAsset as AllMetadataEmptyAsset,
3+
)
4+
from dagster_components.lib.test.simple_asset import SimpleAsset as SimpleAsset
5+
from dagster_components.lib.test.simple_pipes_script_asset import (
6+
SimplePipesScriptAsset as SimplePipesScriptAsset,
7+
)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
from dagster._core.definitions.decorators.asset_decorator import asset
44
from dagster._core.definitions.definitions_class import Definitions
55
from dagster._core.execution.context.asset_execution_context import AssetExecutionContext
6+
from typing_extensions import Self
7+
68
from dagster_components import Component, ComponentLoadContext, component
79
from dagster_components.core.component import ComponentGenerateRequest
810
from dagster_components.core.component_decl_builder import YamlComponentDecl
911
from dagster_components.generate import generate_component_yaml
10-
from typing_extensions import Self
1112

1213
if TYPE_CHECKING:
1314
from dagster_components.core.component import ComponentDeclNode

python_modules/libraries/dagster-components/dagster_components_tests/lib/simple_asset.py renamed to python_modules/libraries/dagster-components/dagster_components/lib/test/simple_asset.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
from dagster._core.definitions.decorators.asset_decorator import asset
55
from dagster._core.definitions.definitions_class import Definitions
66
from dagster._core.execution.context.asset_execution_context import AssetExecutionContext
7+
from pydantic import BaseModel, TypeAdapter
8+
from typing_extensions import Self
9+
710
from dagster_components import Component, ComponentLoadContext, component
811
from dagster_components.core.component import ComponentGenerateRequest
912
from dagster_components.core.component_decl_builder import YamlComponentDecl
1013
from dagster_components.generate import generate_component_yaml
11-
from pydantic import BaseModel, TypeAdapter
12-
from typing_extensions import Self
1314

1415
if TYPE_CHECKING:
1516
from dagster_components.core.component import ComponentDeclNode
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
from dagster._core.definitions.definitions_class import Definitions
99
from dagster._core.execution.context.asset_execution_context import AssetExecutionContext
1010
from dagster._core.pipes.subprocess import PipesSubprocessClient
11+
from pydantic import BaseModel, TypeAdapter
12+
from typing_extensions import Self
13+
1114
from dagster_components import Component, ComponentLoadContext, component
1215
from dagster_components.core.component import ComponentGenerateRequest
1316
from dagster_components.core.component_decl_builder import YamlComponentDecl
1417
from dagster_components.generate import generate_component_yaml
15-
from pydantic import BaseModel, TypeAdapter
16-
from typing_extensions import Self
1718

1819
if TYPE_CHECKING:
1920
from dagster_components.core.component import ComponentDeclNode

python_modules/libraries/dagster-components/dagster_components_tests/lib/__init__.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

python_modules/libraries/dagster-components/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get_version() -> str:
4646
],
4747
"dagster.components": [
4848
"dagster_components = dagster_components.lib",
49-
"dagster_components.test = dagster_components_tests.lib",
49+
"dagster_components.test = dagster_components.lib.test",
5050
],
5151
},
5252
extras_require={

0 commit comments

Comments
 (0)