From 2d176163eb945a145613cacde5b4eaea808c5749 Mon Sep 17 00:00:00 2001 From: Merel Theisen Date: Tue, 12 Dec 2023 16:18:08 +0000 Subject: [PATCH 1/6] Trigger tests Signed-off-by: Merel Theisen --- .circleci/continue_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index b274e73878..f63d741029 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -136,7 +136,7 @@ jobs: - setup - add_ssh_keys - run: - name: Check Kedro version + name: Check the Kedro version command: | KEDRO_VERSION=$(./tools/circleci/github_scripts/kedro_version.py ./kedro) if ./tools/circleci/check-no-version-pypi.sh "${KEDRO_VERSION}" From 43ff0f47c26a64f41a7301e132c9e6a8b98b89a7 Mon Sep 17 00:00:00 2001 From: Merel Theisen Date: Tue, 12 Dec 2023 17:05:45 +0000 Subject: [PATCH 2/6] Loosen bound on kedro-telemetry Signed-off-by: Merel Theisen --- docs/source/tutorial/tutorial_template.md | 4 ++-- .../{{ cookiecutter.repo_name }}/requirements.txt | 2 +- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/tutorial/tutorial_template.md b/docs/source/tutorial/tutorial_template.md index e14be6c4da..4674157f24 100644 --- a/docs/source/tutorial/tutorial_template.md +++ b/docs/source/tutorial/tutorial_template.md @@ -49,8 +49,8 @@ pytest~=7.2 # Kedro dependencies and datasets to work with different data formats (including CSV, Excel, and Parquet) kedro~=0.18.13 -kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset]~=1.1 -kedro-telemetry~=0.2.0 +kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset]>=1.1 +kedro-telemetry>=0.2.0 kedro-viz~=6.0 # Visualise pipelines # For modeling in the data science pipeline diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt index 4d3bf56da4..9ba14ec922 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt @@ -6,7 +6,7 @@ jupyterlab_server>=2.11.1, <2.16.0 jupyterlab~=3.0, <3.6.0 kedro~={{ cookiecutter.kedro_version}} kedro-datasets[pandas.CSVDataset] -kedro-telemetry~=0.2.0 +kedro-telemetry>=0.2.0 pytest-cov~=3.0 pytest-mock>=1.7.1, <2.0 pytest~=7.2 diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index ea1a34549c..3f1c4650e6 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -4,7 +4,7 @@ jupyter~=1.0 jupyterlab_server>=2.11.1, <2.16.0 jupyterlab~=3.0, <3.6.0 kedro~={{ cookiecutter.kedro_version }} -kedro-telemetry~=0.2.0 +kedro-telemetry>=0.2.0 pytest-cov~=3.0 pytest-mock>=1.7.1, <2.0 pytest~=7.2 From 7b8541deda1de20e47a835abc4b36216d8360b10 Mon Sep 17 00:00:00 2001 From: Merel Theisen <49397448+merelcht@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:11:02 +0000 Subject: [PATCH 3/6] Update .circleci/continue_config.yml Signed-off-by: Merel Theisen <49397448+merelcht@users.noreply.github.com> --- .circleci/continue_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index f63d741029..b274e73878 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -136,7 +136,7 @@ jobs: - setup - add_ssh_keys - run: - name: Check the Kedro version + name: Check Kedro version command: | KEDRO_VERSION=$(./tools/circleci/github_scripts/kedro_version.py ./kedro) if ./tools/circleci/check-no-version-pypi.sh "${KEDRO_VERSION}" From 89d938012d72b3338438434c422b254751ee0544 Mon Sep 17 00:00:00 2001 From: Merel Theisen Date: Tue, 12 Dec 2023 17:46:04 +0000 Subject: [PATCH 4/6] Fix broken link in docs Signed-off-by: Merel Theisen --- docs/source/starters/new_project_tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/starters/new_project_tools.md b/docs/source/starters/new_project_tools.md index ba1974a3bc..af33aeb354 100644 --- a/docs/source/starters/new_project_tools.md +++ b/docs/source/starters/new_project_tools.md @@ -233,7 +233,7 @@ To learn more about using logging in your project, or modifying the logging conf Including the Documentation tool adds a `docs` directory to your project structure and includes the Sphinx setup files, `conf.py` and `index.rst`, with some added features such as auto generation of HTML documentation. The aim of this tool reflects Kedro's commitment to best practices in understanding code and facilitating collaboration by helping you create and maintain guides and API docs. -If you did not initially select `docs` and want to implement it later you can do so by following the [official documentation](https://docs.kedro.org/en/stable/tutorial/package_a_project.html#add-documentation-to-a-kedro-project) for guidance on adding documentation to a Kedro project. +If you did not initially select `docs` and want to implement it later you can do so by following the [official documentation](https://docs.kedro.org/en/stable/tutorial/package_a_project.html#add-documentation-to-a-kedro-project-if-you-have-not-selected-docs-tool) for guidance on adding documentation to a Kedro project. ### Data Structure From 78338a4d9299be00316727205945ec2ccd7cae4a Mon Sep 17 00:00:00 2001 From: Merel Theisen Date: Tue, 12 Dec 2023 17:52:47 +0000 Subject: [PATCH 5/6] Fix broken links Signed-off-by: Merel Theisen --- .../deployment/databricks/databricks_deployment_workflow.md | 2 +- docs/source/logging/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/deployment/databricks/databricks_deployment_workflow.md b/docs/source/deployment/databricks/databricks_deployment_workflow.md index 8c564ecff7..431c8b318c 100644 --- a/docs/source/deployment/databricks/databricks_deployment_workflow.md +++ b/docs/source/deployment/databricks/databricks_deployment_workflow.md @@ -237,7 +237,7 @@ Configure the job cluster with the following settings: - Select the runtime `13.3 LTS` in the `Databricks runtime version` field. - In the `Advanced options` section, under the `Spark` tab, locate the `Environment variables` field. Add the following line: `KEDRO_LOGGING_CONFIG="/dbfs/FileStore/iris-databricks/conf/logging.yml"` -Here, ensure you specify the correct path to your custom logging configuration. This step is crucial because the default Kedro logging configuration incorporates the rich library, which is incompatible with Databricks jobs. In the `databricks-iris` Kedro starter, the `rich` handler in `logging.yml` is altered to a `console` handler for compatibility. For additional information about logging configurations, refer to the [Kedro Logging Manual](https://docs.kedro.org/en/stable/logging/logging.html). +Here, ensure you specify the correct path to your custom logging configuration. This step is crucial because the default Kedro logging configuration incorporates the rich library, which is incompatible with Databricks jobs. In the `databricks-iris` Kedro starter, the `rich` handler in `logging.yml` is altered to a `console` handler for compatibility. For additional information about logging configurations, refer to the [Kedro Logging Manual](https://docs.kedro.org/en/stable/logging/index.html). - Leave all other settings with their default values in place. The final configuration for the job cluster should look the same as the following: diff --git a/docs/source/logging/index.md b/docs/source/logging/index.md index 23fb20d26d..6e2eba1561 100644 --- a/docs/source/logging/index.md +++ b/docs/source/logging/index.md @@ -79,7 +79,7 @@ handlers: class: kedro.logging.RichHandler rich_tracebacks: True # Advance options for customisation. - # See https://docs.kedro.org/en/stable/logging/logging.html#project-side-logging-configuration + # See https://docs.kedro.org/en/stable/logging/index.html#how-to-perform-logging-in-your-kedro-project # tracebacks_show_locals: False loggers: From dacda1a9d86fe1d377023bdbaced2bee8ed316bf Mon Sep 17 00:00:00 2001 From: Merel Theisen Date: Wed, 13 Dec 2023 10:34:21 +0000 Subject: [PATCH 6/6] Bump kedro-telemtry to latest version Signed-off-by: Merel Theisen --- docs/source/tutorial/tutorial_template.md | 4 ++-- .../{{ cookiecutter.repo_name }}/requirements.txt | 2 +- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/tutorial/tutorial_template.md b/docs/source/tutorial/tutorial_template.md index 4674157f24..a4e3af35db 100644 --- a/docs/source/tutorial/tutorial_template.md +++ b/docs/source/tutorial/tutorial_template.md @@ -48,9 +48,9 @@ pytest-mock>=1.7.1, <2.0 pytest~=7.2 # Kedro dependencies and datasets to work with different data formats (including CSV, Excel, and Parquet) -kedro~=0.18.13 +kedro~=0.19.0 kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset]>=1.1 -kedro-telemetry>=0.2.0 +kedro-telemetry>=0.3.1 kedro-viz~=6.0 # Visualise pipelines # For modeling in the data science pipeline diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt index 9ba14ec922..baa2f190d4 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt @@ -6,7 +6,7 @@ jupyterlab_server>=2.11.1, <2.16.0 jupyterlab~=3.0, <3.6.0 kedro~={{ cookiecutter.kedro_version}} kedro-datasets[pandas.CSVDataset] -kedro-telemetry>=0.2.0 +kedro-telemetry>=0.3.1 pytest-cov~=3.0 pytest-mock>=1.7.1, <2.0 pytest~=7.2 diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 3f1c4650e6..842ebd8abd 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -4,7 +4,7 @@ jupyter~=1.0 jupyterlab_server>=2.11.1, <2.16.0 jupyterlab~=3.0, <3.6.0 kedro~={{ cookiecutter.kedro_version }} -kedro-telemetry>=0.2.0 +kedro-telemetry>=0.3.1 pytest-cov~=3.0 pytest-mock>=1.7.1, <2.0 pytest~=7.2