Merge pull request #3175 from kedro-org/merge-main-to-develop

[AUTO-MERGE] Merge main into develop via merge-main-to-develop
kedro-org · Oct 16, 2023 · bf536d4 · bf536d4
2 parents eb8f63f + 30480cd
commit bf536d4
Show file tree

Hide file tree

Showing 23 changed files with 155,865 additions and 39 deletions.
diff --git a/.github/workflows/merge-gatekeeper.yml b/.github/workflows/merge-gatekeeper.yml
@@ -24,4 +24,4 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           timeout: 3600
           interval: 30
-          ignored: 'runner / vale,ci/circleci: win_e2e_tests-3.7,ci/circleci: win_pip_compile-3.9,ci/circleci: win_e2e_tests-3.9,ci/circleci: win_pip_compile-3.8,ci/circleci: lint-3.7,ci/circleci: win_pip_compile-3.7,ci/circleci: pip_compile-3.7,ci/circleci: e2e_tests-3.7,ci/circleci: win_unit_tests-3.7,ci/circleci: win_unit_tests-3.9,ci/circleci: e2e_tests-3.8,ci/circleci: win_unit_tests-3.10,ci/circleci: win_pip_compile-3.10,ci/circleci: win_unit_tests-3.8,ci/circleci: e2e_tests-3.9,ci/circleci: unit_tests-3.10,ci/circleci: unit_tests-3.8,ci/circleci: e2e_tests-3.10,ci/circleci: lint-3.8,ci/circleci: unit_tests-3.9,ci/circleci: unit_tests-3.7,ci/circleci: win_e2e_tests-3.10,ci/circleci: pip_compile-3.8,ci/circleci: pip_compile-3.10,ci/circleci: win_e2e_tests-3.8,ci/circleci: lint-3.9,ci/circleci: pip_compile-3.9,ci/circleci: lint-3.10,build_code,ci/circleci: check-updated-files,regular'
+          ignored: 'lint_only, runner / vale,ci/circleci: win_e2e_tests-3.7,ci/circleci: win_pip_compile-3.9,ci/circleci: win_e2e_tests-3.9,ci/circleci: win_pip_compile-3.8,ci/circleci: lint-3.7,ci/circleci: win_pip_compile-3.7,ci/circleci: pip_compile-3.7,ci/circleci: e2e_tests-3.7,ci/circleci: win_unit_tests-3.7,ci/circleci: win_unit_tests-3.9,ci/circleci: e2e_tests-3.8,ci/circleci: win_unit_tests-3.10,ci/circleci: win_pip_compile-3.10,ci/circleci: win_unit_tests-3.8,ci/circleci: e2e_tests-3.9,ci/circleci: unit_tests-3.10,ci/circleci: unit_tests-3.8,ci/circleci: e2e_tests-3.10,ci/circleci: lint-3.8,ci/circleci: unit_tests-3.9,ci/circleci: unit_tests-3.7,ci/circleci: win_e2e_tests-3.10,ci/circleci: pip_compile-3.8,ci/circleci: pip_compile-3.10,ci/circleci: win_e2e_tests-3.8,ci/circleci: lint-3.9,ci/circleci: pip_compile-3.9,ci/circleci: lint-3.10,build_code,ci/circleci: check-updated-files,regular'
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ test:
 	pytest --numprocesses 4 --dist loadfile
 
 e2e-tests:
-	behave
+	behave --tags=-skip
 
 pip-compile:
 	pip-compile -q -o -

diff --git a/RELEASE.md b/RELEASE.md
@@ -43,6 +43,7 @@
 
 ## Bug fixes and other changes
 * Updated dataset factories to resolve nested catalog config properly.
+* Updated `OmegaConfigLoader` to handle paths containing dots outside of `conf_source`.
 
 ## Documentation changes
 * Added documentation to clarify execution order of hooks.
@@ -52,11 +53,13 @@
 ## Upcoming deprecations for Kedro 0.19.0
 * All dataset classes will be removed from the core Kedro repository (`kedro.extras.datasets`). Install and import them from the [`kedro-datasets`](https://github.com/kedro-org/kedro-plugins/tree/main/kedro-datasets) package instead.
 * All dataset classes ending with `DataSet` are deprecated and will be removed in Kedro `0.19.0` and `kedro-datasets` `2.0.0`. Instead, use the updated class names ending with `Dataset`.
+* `PartitionedDataset` and `IncrementalDataset` have been moved to `kedro-datasets` and will be removed in Kedro `0.19.0`. Install and import them from the [`kedro-datasets`](https://github.com/kedro-org/kedro-plugins/tree/main/kedro-datasets) package instead.
 
 ## Community contributions
 Many thanks to the following Kedroids for contributing PRs to this release:
 
 * [Jason Hite](https://github.com/jasonmhite)
+* [IngerMathilde](https://github.com/IngerMathilde)
 
 
 # Release 0.18.13

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -92,11 +92,6 @@ Welcome to Kedro's documentation!
    :maxdepth: 2
    :caption: Kedro projects
 
-   kedro_project_setup/index.md
-
-.. toctree::
-   :maxdepth: 2
-
    configuration/index.md
 
 .. toctree::
@@ -113,14 +108,18 @@ Welcome to Kedro's documentation!
    :maxdepth: 2
    :caption: Advanced usage
 
+   kedro_project_setup/index.md
+
+.. toctree::
+   :maxdepth: 2
+
    extend_kedro/index.md
 
 .. toctree::
    :maxdepth: 2
 
    hooks/index.md
 
-
 .. toctree::
    :maxdepth: 2
 

diff --git a/docs/source/kedro_project_setup/index.md b/docs/source/kedro_project_setup/index.md
@@ -1,4 +1,4 @@
-# Kedro project setup
+# Project setup
 
 ```{toctree}
 :maxdepth: 1

diff --git a/docs/source/notebooks_and_ipython/index.md b/docs/source/notebooks_and_ipython/index.md
@@ -13,5 +13,6 @@ The page titled [Use a Jupyter notebook for Kedro project experiments](./kedro_a
 ```{toctree}
 :maxdepth: 1
 
+notebook-example/add_kedro_to_a_notebook
 kedro_and_notebooks
 ```