diff --git a/demo-project/conf/base/catalog_01_raw.yml b/demo-project/conf/base/catalog_01_raw.yml index 2234d597ed..b2d71bf82c 100644 --- a/demo-project/conf/base/catalog_01_raw.yml +++ b/demo-project/conf/base/catalog_01_raw.yml @@ -1,5 +1,5 @@ companies: - type: pandas.CSVDataSet + type: pandas.CSVDataset filepath: ${_base_location}/01_raw/companies.csv metadata: kedro-viz: @@ -8,7 +8,7 @@ companies: nrows: 5 reviews: - type: pandas.CSVDataSet + type: pandas.CSVDataset filepath: ${_base_location}/01_raw/reviews.csv metadata: kedro-viz: @@ -18,7 +18,7 @@ reviews: shuttles: - type: pandas.ExcelDataSet + type: pandas.ExcelDataset filepath: ${_base_location}/01_raw/shuttles.xlsx metadata: kedro-viz: diff --git a/demo-project/conf/base/catalog_02_int.yml b/demo-project/conf/base/catalog_02_int.yml index 576a3f015c..9b75ff1f17 100644 --- a/demo-project/conf/base/catalog_02_int.yml +++ b/demo-project/conf/base/catalog_02_int.yml @@ -1,26 +1,26 @@ ingestion.int_typed_companies: - type: pandas.ParquetDataSet + type: pandas.ParquetDataset filepath: ${_base_location}/02_intermediate/typed_companies.pq metadata: kedro-viz: layer: intermediate ingestion.int_typed_shuttles@pandas1: - type: pandas.ParquetDataSet + type: pandas.ParquetDataset filepath: ${_base_location}/02_intermediate/typed_shuttles.pq metadata: kedro-viz: layer: intermediate ingestion.int_typed_shuttles@pandas2: - type: pandas.ParquetDataSet + type: pandas.ParquetDataset filepath: ${_base_location}/02_intermediate/typed_shuttles.pq metadata: kedro-viz: layer: intermediate ingestion.int_typed_reviews: - type: pandas.ParquetDataSet + type: pandas.ParquetDataset filepath: ${_base_location}/02_intermediate/typed_reviews.pq metadata: kedro-viz: diff --git a/demo-project/conf/base/catalog_03_prm.yml b/demo-project/conf/base/catalog_03_prm.yml index d4d9331807..f86f45854a 100644 --- a/demo-project/conf/base/catalog_03_prm.yml +++ b/demo-project/conf/base/catalog_03_prm.yml @@ -1,12 +1,12 @@ prm_shuttle_company_reviews: - type: pandas.ParquetDataSet + type: pandas.ParquetDataset filepath: ${_base_location}/03_primary/prm_shuttle_company_reviews.pq metadata: kedro-viz: layer: primary prm_spine_table: - type: pandas.ParquetDataSet + type: pandas.ParquetDataset filepath: ${_base_location}/03_primary/prm_spine_table.pq metadata: kedro-viz: diff --git a/demo-project/conf/base/catalog_04_feature.yml b/demo-project/conf/base/catalog_04_feature.yml index 4c503ca053..738a053352 100644 --- a/demo-project/conf/base/catalog_04_feature.yml +++ b/demo-project/conf/base/catalog_04_feature.yml @@ -1,11 +1,11 @@ # Use dataset factories to reduce duplication "feature_engineering.feat_{metric_type}_metrics": - type: pandas.ParquetDataSet + type: pandas.ParquetDataset filepath: ${_base_location}/04_feature/feat_{metric_type}_metrics.pq layer: feature feature_importance_output: - type: pandas.CSVDataSet + type: pandas.CSVDataset filepath: ${_base_location}/04_feature/feature_importance_output.csv metadata: kedro-viz: diff --git a/demo-project/conf/base/catalog_05_model_input.yml b/demo-project/conf/base/catalog_05_model_input.yml index 79beec442b..031b2ba42a 100644 --- a/demo-project/conf/base/catalog_05_model_input.yml +++ b/demo-project/conf/base/catalog_05_model_input.yml @@ -1,5 +1,5 @@ model_input_table: - type: pandas.ParquetDataSet + type: pandas.ParquetDataset filepath: ${_base_location}/05_model_input/model_input_table.pq metadata: kedro-viz: diff --git a/demo-project/conf/base/catalog_06_models.yml b/demo-project/conf/base/catalog_06_models.yml index 09eea74348..f935948f8c 100644 --- a/demo-project/conf/base/catalog_06_models.yml +++ b/demo-project/conf/base/catalog_06_models.yml @@ -1,9 +1,9 @@ train_evaluation.linear_regression.regressor: - type: pickle.PickleDataSet + type: pickle.PickleDataset filepath: ${_base_location}/06_models/linear_regression.pkl versioned: True train_evaluation.random_forest.regressor: - type: pickle.PickleDataSet + type: pickle.PickleDataset filepath: ${_base_location}/06_models/random_forest.pkl versioned: True diff --git a/demo-project/conf/base/catalog_08_reporting.yml b/demo-project/conf/base/catalog_08_reporting.yml index f41521c6e9..2cd3d21411 100644 --- a/demo-project/conf/base/catalog_08_reporting.yml +++ b/demo-project/conf/base/catalog_08_reporting.yml @@ -1,5 +1,5 @@ reporting.cancellation_policy_breakdown: - type: plotly.PlotlyDataSet # Constructed via plotly_args below + type: plotly.PlotlyDataset # Constructed via plotly_args below filepath: ${_base_location}/08_reporting/cancellation_breakdown.json metadata: kedro-viz: @@ -15,7 +15,7 @@ reporting.cancellation_policy_breakdown: price: 'fleet_price' reporting.price_histogram: - type: plotly.JSONDataSet # Constructed via Python API + type: plotly.JSONDataset # Constructed via Python API filepath: ${_base_location}/08_reporting/price_histogram.json metadata: kedro-viz: @@ -23,7 +23,7 @@ reporting.price_histogram: versioned: true reporting.feature_importance: - type: plotly.JSONDataSet # Constructed via Python API + type: plotly.JSONDataset # Constructed via Python API filepath: ${_base_location}/08_reporting/feature_importance_plot.json metadata: kedro-viz: @@ -31,7 +31,7 @@ reporting.feature_importance: versioned: true reporting.cancellation_policy_grid: - type: demo_project.extras.datasets.image_dataset.ImageDataSet + type: demo_project.extras.datasets.image_dataset.ImageDataset filepath: ${_base_location}/08_reporting/cancellation_policy_grid.png reporting.confusion_matrix: diff --git a/demo-project/conf/base/catalog_09_tracking.yml b/demo-project/conf/base/catalog_09_tracking.yml index 47518e3cf6..1264e2d02b 100644 --- a/demo-project/conf/base/catalog_09_tracking.yml +++ b/demo-project/conf/base/catalog_09_tracking.yml @@ -1,19 +1,19 @@ train_evaluation.linear_regression.r2_score: - type: tracking.MetricsDataSet + type: tracking.MetricsDataset filepath: ${_base_location}/09_tracking/linear_score.json versioned: True train_evaluation.random_forest.r2_score: - type: tracking.MetricsDataSet + type: tracking.MetricsDataset filepath: ${_base_location}/09_tracking/rf_score.json versioned: True train_evaluation.linear_regression.experiment_params: - type: tracking.JSONDataSet + type: tracking.JSONDataset filepath: ${_base_location}/09_tracking/linear_params.json versioned: True train_evaluation.random_forest.experiment_params: - type: tracking.JSONDataSet + type: tracking.JSONDataset filepath: ${_base_location}/09_tracking/rf_params.json versioned: True diff --git a/demo-project/src/demo_project/extras/datasets/image_dataset.py b/demo-project/src/demo_project/extras/datasets/image_dataset.py index 5640b62923..d91355500b 100644 --- a/demo-project/src/demo_project/extras/datasets/image_dataset.py +++ b/demo-project/src/demo_project/extras/datasets/image_dataset.py @@ -8,7 +8,7 @@ from PIL import Image -class ImageDataSet(AbstractDataset): +class ImageDataset(AbstractDataset): """``ImageDataSet`` loads / save image data from a given filepath as `numpy` array using Pillow. diff --git a/demo-project/src/demo_project/pipelines/data_ingestion/requirements.txt b/demo-project/src/demo_project/pipelines/data_ingestion/requirements.txt deleted file mode 100644 index 77472c4d7d..0000000000 --- a/demo-project/src/demo_project/pipelines/data_ingestion/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -kedro==0.18.4 -kedro-datasets[pandas.CSVDataSet,pandas.ExcelDataSet, pandas.ParquetDataSet]==1.0.1 \ No newline at end of file diff --git a/demo-project/src/demo_project/pipelines/feature_engineering/requirements.txt b/demo-project/src/demo_project/pipelines/feature_engineering/requirements.txt deleted file mode 100644 index ab0f01d6bd..0000000000 --- a/demo-project/src/demo_project/pipelines/feature_engineering/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -kedro==0.18.4 -kedro-datasets[pandas.ParquetDataSet]==1.0.1 diff --git a/demo-project/src/demo_project/pipelines/modelling/requirements.txt b/demo-project/src/demo_project/pipelines/modelling/requirements.txt deleted file mode 100644 index 6a9152ddc2..0000000000 --- a/demo-project/src/demo_project/pipelines/modelling/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -kedro==0.18.4 -kedro-datasets[pandas.ParquetDataSet]==1.0.1 -scikit-learn~=1.0 diff --git a/demo-project/src/demo_project/pipelines/reporting/requirements.txt b/demo-project/src/demo_project/pipelines/reporting/requirements.txt deleted file mode 100644 index e549a52f08..0000000000 --- a/demo-project/src/demo_project/pipelines/reporting/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -kedro==0.18.4 -kedro-datasets[plotly.PlotlyDataSet, plotly.JSONDataSet, matplotlib.MatplotlibWriter]==1.0.1 -pillow==9.3.0 -seaborn==0.11.2 diff --git a/demo-project/src/demo_project/requirements.in b/demo-project/src/demo_project/requirements.in index 415f11a386..dd53d43f3a 100644 --- a/demo-project/src/demo_project/requirements.in +++ b/demo-project/src/demo_project/requirements.in @@ -6,7 +6,7 @@ jupyter~=1.0 jupyter_client>=5.1, <7.0 jupyterlab~=3.0 kedro~=0.18.0 -kedro-datasets[pandas.CSVDataSet,pandas.ExcelDataSet, pandas.ParquetDataSet, plotly.PlotlyDataSet]<=2.0.0 +kedro-datasets[pandas.CSVDataset,pandas.ExcelDataset, pandas.ParquetDataset, plotly.PlotlyDataset]<=2.0.0 nbstripout~=0.4 pytest-cov~=2.5 pytest-mock>=1.7.1, <2.0 diff --git a/demo-project/src/docker_requirements.txt b/demo-project/src/docker_requirements.txt index e696ce59ac..1934ea38d1 100644 --- a/demo-project/src/docker_requirements.txt +++ b/demo-project/src/docker_requirements.txt @@ -1,5 +1,5 @@ kedro>=0.18.0 -kedro-datasets[pandas.CSVDataSet,pandas.ExcelDataSet, pandas.ParquetDataSet, plotly.PlotlyDataSet, matplotlib.MatplotlibWriter]<=2.0.0 +kedro-datasets[pandas.CSVDataset,pandas.ExcelDataset, pandas.ParquetDataset, plotly.PlotlyDataset, matplotlib.MatplotlibWriter]<=2.0.0 scikit-learn~=1.0 pillow~=9.0 seaborn~=0.11.2