diff --git a/elyra/pipeline/airflow/component_parser_airflow.py b/elyra/pipeline/airflow/airflow_component_parser.py similarity index 100% rename from elyra/pipeline/airflow/component_parser_airflow.py rename to elyra/pipeline/airflow/airflow_component_parser.py diff --git a/elyra/pipeline/airflow/processor_airflow.py b/elyra/pipeline/airflow/airflow_processor.py similarity index 100% rename from elyra/pipeline/airflow/processor_airflow.py rename to elyra/pipeline/airflow/airflow_processor.py diff --git a/elyra/pipeline/component.py b/elyra/pipeline/component.py index b40394847..aad5513e6 100644 --- a/elyra/pipeline/component.py +++ b/elyra/pipeline/component.py @@ -227,8 +227,8 @@ class ComponentParser(LoggingConfigurable): # ABC component_platform: RuntimeProcessorType = None _file_types: List[str] = None _parser_class_map: Dict[str, str] = { - "APACHE_AIRFLOW": "elyra.pipeline.airflow.component_parser_airflow:AirflowComponentParser", - "KUBEFLOW_PIPELINES": "elyra.pipeline.kfp.component_parser_kfp:KfpComponentParser", + "APACHE_AIRFLOW": "elyra.pipeline.airflow.airflow_component_parser:AirflowComponentParser", + "KUBEFLOW_PIPELINES": "elyra.pipeline.kfp.kfp_component_parser:KfpComponentParser", } @classmethod diff --git a/elyra/pipeline/kfp/component_parser_kfp.py b/elyra/pipeline/kfp/kfp_component_parser.py similarity index 100% rename from elyra/pipeline/kfp/component_parser_kfp.py rename to elyra/pipeline/kfp/kfp_component_parser.py diff --git a/elyra/pipeline/kfp/processor_kfp.py b/elyra/pipeline/kfp/kfp_processor.py similarity index 100% rename from elyra/pipeline/kfp/processor_kfp.py rename to elyra/pipeline/kfp/kfp_processor.py diff --git a/elyra/pipeline/local/processor_local.py b/elyra/pipeline/local/local_processor.py similarity index 100% rename from elyra/pipeline/local/processor_local.py rename to elyra/pipeline/local/local_processor.py diff --git a/elyra/tests/pipeline/airflow/test_processor_airflow.py b/elyra/tests/pipeline/airflow/test_processor_airflow.py index 7217aae7a..eccf32fa8 100644 --- a/elyra/tests/pipeline/airflow/test_processor_airflow.py +++ b/elyra/tests/pipeline/airflow/test_processor_airflow.py @@ -27,7 +27,7 @@ import pytest from elyra.metadata.metadata import Metadata -from elyra.pipeline.airflow.processor_airflow import AirflowPipelineProcessor +from elyra.pipeline.airflow.airflow_processor import AirflowPipelineProcessor from elyra.pipeline.parser import PipelineParser from elyra.pipeline.pipeline import GenericOperation from elyra.pipeline.pipeline_constants import COS_OBJECT_PREFIX diff --git a/elyra/tests/pipeline/kfp/conftest.py b/elyra/tests/pipeline/kfp/conftest.py index 239c7a78f..3425bf2d1 100644 --- a/elyra/tests/pipeline/kfp/conftest.py +++ b/elyra/tests/pipeline/kfp/conftest.py @@ -29,7 +29,7 @@ from elyra.metadata.schemaspaces import RuntimeImages from elyra.metadata.schemaspaces import Runtimes from elyra.metadata.storage import FileMetadataStore -from elyra.pipeline.kfp.processor_kfp import WorkflowEngineType +from elyra.pipeline.kfp.kfp_processor import WorkflowEngineType from elyra.pipeline.parser import PipelineParser from elyra.pipeline.pipeline import Pipeline from elyra.pipeline.pipeline_constants import COS_OBJECT_PREFIX diff --git a/elyra/tests/pipeline/kfp/test_component_parser_kfp.py b/elyra/tests/pipeline/kfp/test_kfp_component_parser.py similarity index 99% rename from elyra/tests/pipeline/kfp/test_component_parser_kfp.py rename to elyra/tests/pipeline/kfp/test_kfp_component_parser.py index 6250d2e73..f3d4d67dd 100644 --- a/elyra/tests/pipeline/kfp/test_component_parser_kfp.py +++ b/elyra/tests/pipeline/kfp/test_kfp_component_parser.py @@ -32,7 +32,7 @@ from elyra.pipeline.catalog_connector import UrlComponentCatalogConnector from elyra.pipeline.component_catalog import ComponentCache from elyra.pipeline.component_metadata import ComponentCatalogMetadata -from elyra.pipeline.kfp.component_parser_kfp import KfpComponentParser +from elyra.pipeline.kfp.kfp_component_parser import KfpComponentParser from elyra.pipeline.runtime_type import RuntimeProcessorType COMPONENT_CATALOG_DIRECTORY = os.path.join(jupyter_core.paths.ENV_JUPYTER_PATH[0], "components") diff --git a/elyra/tests/pipeline/kfp/test_processor_kfp.py b/elyra/tests/pipeline/kfp/test_kfp_processor.py similarity index 99% rename from elyra/tests/pipeline/kfp/test_processor_kfp.py rename to elyra/tests/pipeline/kfp/test_kfp_processor.py index 8cee71fef..26ccbac40 100644 --- a/elyra/tests/pipeline/kfp/test_processor_kfp.py +++ b/elyra/tests/pipeline/kfp/test_kfp_processor.py @@ -28,15 +28,15 @@ from elyra.pipeline.catalog_connector import FilesystemComponentCatalogConnector from elyra.pipeline.component import Component +from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_DEF_MEDIUM +from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_DEF_NAME +from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_DEF_SIZE +from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_MOUNT_PATH +from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_PYTHON_PATH +from elyra.pipeline.kfp.kfp_processor import CRIO_VOL_WORKDIR_PATH +from elyra.pipeline.kfp.kfp_processor import KfpPipelineProcessor +from elyra.pipeline.kfp.kfp_processor import WorkflowEngineType from elyra.pipeline.kfp.kfp_properties import KfpPipelineParameter -from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_DEF_MEDIUM -from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_DEF_NAME -from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_DEF_SIZE -from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_MOUNT_PATH -from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_PYTHON_PATH -from elyra.pipeline.kfp.processor_kfp import CRIO_VOL_WORKDIR_PATH -from elyra.pipeline.kfp.processor_kfp import KfpPipelineProcessor -from elyra.pipeline.kfp.processor_kfp import WorkflowEngineType from elyra.pipeline.pipeline import GenericOperation from elyra.pipeline.pipeline import Operation from elyra.pipeline.pipeline import Pipeline diff --git a/elyra/tests/pipeline/local/test_pipeline_processor_local.py b/elyra/tests/pipeline/local/test_pipeline_processor_local.py index 4be096c2a..8f62cf52c 100644 --- a/elyra/tests/pipeline/local/test_pipeline_processor_local.py +++ b/elyra/tests/pipeline/local/test_pipeline_processor_local.py @@ -18,7 +18,7 @@ import nbformat import pytest -from elyra.pipeline.local.processor_local import LocalPipelineProcessor +from elyra.pipeline.local.local_processor import LocalPipelineProcessor from elyra.pipeline.parser import PipelineParser from elyra.pipeline.pipeline import GenericOperation from elyra.tests.pipeline.util import _read_pipeline_resource diff --git a/elyra/tests/pipeline/test_processor.py b/elyra/tests/pipeline/test_processor.py index bd4e7140f..5b8935c14 100644 --- a/elyra/tests/pipeline/test_processor.py +++ b/elyra/tests/pipeline/test_processor.py @@ -18,7 +18,7 @@ import pytest -from elyra.pipeline.kfp.processor_kfp import KfpPipelineProcessor +from elyra.pipeline.kfp.kfp_processor import KfpPipelineProcessor from elyra.pipeline.pipeline import GenericOperation from elyra.pipeline.properties import ElyraProperty from elyra.pipeline.registry import PipelineProcessorRegistry diff --git a/pyproject.toml b/pyproject.toml index 2c2920f75..f82513b06 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -137,9 +137,9 @@ airflow-package-catalog-schema = "elyra.pipeline.airflow.package_catalog_connect metadata-tests = "elyra.tests.metadata.test_utils:MetadataTestSchemasProvider" [project.entry-points."elyra.pipeline.processors"] -local = "elyra.pipeline.local.processor_local:LocalPipelineProcessor" -airflow = "elyra.pipeline.airflow.processor_airflow:AirflowPipelineProcessor" -kfp = "elyra.pipeline.kfp.processor_kfp:KfpPipelineProcessor" +local = "elyra.pipeline.local.local_processor:LocalPipelineProcessor" +airflow = "elyra.pipeline.airflow.airflow_processor:AirflowPipelineProcessor" +kfp = "elyra.pipeline.kfp.kfp_processor:KfpPipelineProcessor" [project.entry-points."elyra.component.catalog_types"] url-catalog = "elyra.pipeline.catalog_connector:UrlComponentCatalogConnector"