[KED-2419] Make pipeline and Pipeline consistent (#59)

kedro-org · Feb 11, 2022 · ed0be30 · ed0be30
1 parent 2b23ec8
commit ed0be30
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -100,3 +100,4 @@ workflows:
       - lint_38
       - lint_37
       - lint_36
+
diff --git a/...repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_engineering/pipeline.py b/...repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_engineering/pipeline.py
@@ -4,13 +4,13 @@
 Delete this when you start working on your own Kedro project.
 """
 
-from kedro.pipeline import Pipeline, node
+from kedro.pipeline import node, pipeline
 
 from .nodes import split_data
 
 
 def create_pipeline(**kwargs):
-    return Pipeline(
+    return pipeline(
         [
             node(
                 split_data,

diff --git a/...ter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_science/pipeline.py b/...ter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_science/pipeline.py
@@ -4,13 +4,13 @@
 Delete this when you start working on your own Kedro project.
 """
 
-from kedro.pipeline import Pipeline, node
+from kedro.pipeline import node, pipeline
 
 from .nodes import predict, report_accuracy, train_model
 
 
 def create_pipeline(**kwargs):
-    return Pipeline(
+    return pipeline(
         [
             node(
                 train_model,

diff --git a/...repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_engineering/pipeline.py b/...repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_engineering/pipeline.py
@@ -4,13 +4,13 @@
 Delete this when you start working on your own Kedro project.
 """
 
-from kedro.pipeline import Pipeline, node
+from kedro.pipeline import node, pipeline
 
 from .nodes import split_data
 
 
 def create_pipeline(**kwargs):
-    return Pipeline(
+    return pipeline(
         [
             node(
                 split_data,

diff --git a/...ter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_science/pipeline.py b/...ter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_science/pipeline.py
@@ -4,13 +4,13 @@
 Delete this when you start working on your own Kedro project.
 """
 
-from kedro.pipeline import Pipeline, node
+from kedro.pipeline import node, pipeline
 
 from .nodes import predict, report_accuracy, train_model
 
 
 def create_pipeline(**kwargs):
-    return Pipeline(
+    return pipeline(
         [
             node(
                 train_model,

diff --git a/...repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_engineering/pipeline.py b/...repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_engineering/pipeline.py
@@ -1,13 +1,13 @@
 """Example data engineering pipeline with PySpark.
 """
 
-from kedro.pipeline import Pipeline, node
+from kedro.pipeline import node, pipeline
 
 from .nodes import split_data, transform_features
 
 
 def create_pipeline(**kwargs):
-    return Pipeline(
+    return pipeline(
         [
             node(
                 transform_features,

diff --git a/...ter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_science/pipeline.py b/...ter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_science/pipeline.py
@@ -1,13 +1,13 @@
 """Example data science pipeline using PySpark.
 """
 
-from kedro.pipeline import Pipeline, node
+from kedro.pipeline import node, pipeline
 
 from .nodes import predict, report_accuracy, train_model
 
 
 def create_pipeline(**kwargs):
-    return Pipeline(
+    return pipeline(
         [
             node(
                 train_model,

diff --git a/...k/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipeline_registry.py b/...k/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipeline_registry.py
@@ -1,7 +1,7 @@
 """Project pipelines."""
 from typing import Dict
 
-from kedro.pipeline import Pipeline
+from kedro.pipeline import Pipeline, pipeline
 
 
 def register_pipelines() -> Dict[str, Pipeline]:
@@ -11,4 +11,4 @@ def register_pipelines() -> Dict[str, Pipeline]:
         A mapping from a pipeline name to a ``Pipeline`` object.
 
     """
-    return {"__default__": Pipeline([])}
+    return {"__default__": pipeline([])}
diff --git a/spaceflights/{{ cookiecutter.repo_name }}/conf/base/parameters/data_science.yml b/spaceflights/{{ cookiecutter.repo_name }}/conf/base/parameters/data_science.yml
@@ -12,7 +12,7 @@ model_options:
     - review_scores_rating
 
 model_options_experimental:
-  test_size: 0.3
+  test_size: 0.2
   random_state: 8
   features:
     - engines

diff --git a/spaceflights/{{ cookiecutter.repo_name }}/src/requirements.txt b/spaceflights/{{ cookiecutter.repo_name }}/src/requirements.txt
@@ -15,5 +15,6 @@ nbstripout~=0.4
 pytest-cov~=3.0
 pytest-mock>=1.7.1, <2.0
 pytest~=6.2
-scikit-learn~=0.24
+scikit-learn~=1.0; python_version > '3.6'
+scikit-learn~=0.24; python_version == '3.6'
 wheel>=0.35, <0.37
diff --git a/....repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py b/....repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py
@@ -5,7 +5,7 @@
 
 
 def create_pipeline(**kwargs) -> Pipeline:
-    pipeline_instance = Pipeline(
+    return pipeline(
         [
             node(
                 func=preprocess_companies,
@@ -25,13 +25,8 @@ def create_pipeline(**kwargs) -> Pipeline:
                 outputs="model_input_table",
                 name="create_model_input_table_node",
             ),
-        ]
-    )
-
-    namespaced_pipeline = pipeline(
-        pipe=pipeline_instance,
+        ],
         namespace="data_processing",
         inputs=["companies", "shuttles", "reviews"],
         outputs="model_input_table",
     )
-    return namespaced_pipeline
diff --git a/...ter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_science/pipeline.py b/...ter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_science/pipeline.py
@@ -5,7 +5,7 @@
 
 
 def create_pipeline(**kwargs) -> Pipeline:
-    pipeline_instance = Pipeline(
+    pipeline_instance = pipeline(
         [
             node(
                 func=split_data,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,3 +100,4 @@ workflows:
		- lint_38
		- lint_37
		- lint_36