Merge branch 'develop' into merge-main-to-develop

# Conflicts: # tools/circleci/docker_build_img/build.sh Signed-off-by: Antony Milne <antony.milne@quantumblack.com>
kedro-org · Jan 21, 2022 · 797f8a4 · 797f8a4
2 parents 70736d6 + 2cfba89
commit 797f8a4
Show file tree

Hide file tree

Showing 254 changed files with 6,275 additions and 7,341 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,6 +28,11 @@ commands:
       - run:
           name: Activate conda environment
           command: echo "conda deactivate; conda activate kedro_builder" >> $BASH_ENV
+      - run:
+          # pytables does not work properly with python 3.9 to handle our HDFDataSet
+          # if pip-installed, so we install this dependency via conda
+          name: Install conda packages
+          command: echo "conda install -c conda-forge pytables -y" >> $BASH_ENV
 
   setup_requirements:
     steps:
@@ -120,6 +125,11 @@ commands:
 
   win_setup_requirements:
     steps:
+      # pytables and Fiona have a series of binary dependencies under Windows that
+      # are best handled by conda-installing instead of pip-installing them.
+      - run:
+          name: Install pytables
+          command: conda activate kedro_builder; conda install -c conda-forge pytables -y
       - run:
           name: Install GDAL
           command: conda activate kedro_builder; conda install -c conda-forge gdal -y
@@ -217,20 +227,9 @@ jobs:
           # Setting it to 2 or higher will suppress the warning messages totally.
           name: Set HDF5_DISABLE_VERSION_CHECK environment variable
           command: setx /m HDF5_DISABLE_VERSION_CHECK 1
-      - unless:
-          condition:
-            equal: ["3.6", <<parameters.python_version>>]
-          steps:
-            - run:
-                name: Run unit tests without spark
-                command: conda activate kedro_builder; make test-no-spark
-      - when:
-          condition:
-            equal: ["3.6", <<parameters.python_version>>]
-          steps:
-            - run:
-                name: Run unit tests without spark or tensorflow
-                command: conda activate kedro_builder; pytest tests --no-cov --ignore tests/extras/datasets/spark --ignore tests/extras/datasets/tensorflow --numprocesses 4 --dist loadfile
+      - run:
+          name: Run unit tests without spark
+          command: conda activate kedro_builder; make test-no-spark
 
   lint:
     parameters:
@@ -457,31 +456,31 @@ workflows:
       - e2e_tests:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
       - win_e2e_tests:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
       - unit_tests:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
       - win_unit_tests:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
       - lint:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
       - pip_compile:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
       - win_pip_compile:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
       - build_docs
       - docs_linkcheck
       - all_circleci_checks_succeeded:
@@ -534,7 +533,7 @@ workflows:
       - build_kedro:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
           requires:
             - build_docker_image-<<matrix.python_version>>
 
@@ -564,7 +563,7 @@ workflows:
       - build_kedro:
           matrix:
             parameters:
-              python_version: ["3.6", "3.7", "3.8"]
+              python_version: ["3.7", "3.8", "3.9"]
       - publish_kedro:
           requires:
             - build_kedro
diff --git a/.gitignore b/.gitignore
@@ -147,6 +147,9 @@ kedro.db
 .*.swo
 .*.swp
 
+# Prettier
+.prettierignore
+
 .pytest_cache/
 kedro/html
 docs/tmp-build-artifacts

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -29,7 +29,7 @@ repos:
             exclude: "^kedro/templates/|^features/steps/test_starter/"
 
     - repo: https://github.com/pre-commit/mirrors-mypy
-      rev: v0.720
+      rev: v0.812
       hooks:
           - id: mypy
             args: [--allow-redefinition, --ignore-missing-imports]

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -21,7 +21,7 @@ formats:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.6
+  version: 3.7
   install:
     - method: pip
       path: .

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -43,12 +43,12 @@ Check the [Kedro repo to find open pull requests](https://github.com/kedro-org/k
 
 ## Contribute a fix or feature
 
-If you're interested in contributing fixes to code or documentation, first read our [guidelines for contributing developers](https://kedro.readthedocs.io/en/stable/14_contribution/02_developer_contributor_guidelines.html) for an explanation of how to get set up and the process you'll follow.
+If you're interested in contributing fixes to code or documentation, first read our [guidelines for contributing developers](https://kedro.readthedocs.io/en/stable/contribution/developer_contributor_guidelines.html) for an explanation of how to get set up and the process you'll follow.
 
 Once you are ready to contribute, a good place to start is to take a look at the `good first issues` and `help wanted issues` on [GitHub](https://github.com/kedro-org/kedro/issues).
 
 ## Contribute to the documentation
 
 You can help us improve the [Kedro documentation online](https://kedro.readthedocs.io/en/stable/). Send us feedback as a [GitHub issue](https://github.com/kedro-org/kedro/issues) or start a documentation discussion on [GitHub](https://github.com/kedro-org/kedro/discussions).
 
-You are also welcome to make a raise a PR with a bug fix or addition to the documentation. First read the guide [Contribute to the Kedro documentation](https://kedro.readthedocs.io/en/stable/14_contribution/04_documentation_contributor_guidelines.html).
+You are also welcome to make a raise a PR with a bug fix or addition to the documentation. First read the guide [Contribute to the Kedro documentation](https://kedro.readthedocs.io/en/stable/contribution/documentation_contributor_guidelines.html).
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ![Kedro Logo Banner](https://raw.githubusercontent.com/kedro-org/kedro/develop/static/img/kedro_banner.png)
-[![Python version](https://img.shields.io/badge/python-3.6%20%7C%203.7%20%7C%203.8-blue.svg)](https://pypi.org/project/kedro/)
+[![Python version](https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9-blue.svg)](https://pypi.org/project/kedro/)
 [![PyPI version](https://badge.fury.io/py/kedro.svg)](https://pypi.org/project/kedro/)
 [![Conda version](https://img.shields.io/conda/vn/conda-forge/kedro.svg)](https://anaconda.org/conda-forge/kedro)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/kedro-org/kedro/blob/main/LICENSE.md)
@@ -28,7 +28,7 @@ It is also possible to install Kedro using `conda`:
 conda install -c conda-forge kedro
 ```
 
-Our [Get Started guide](https://kedro.readthedocs.io/en/stable/02_get_started/01_prerequisites.html) contains full installation instructions, and includes how to set up Python virtual environments.
+Our [Get Started guide](https://kedro.readthedocs.io/en/stable/get_started/prerequisites.html) contains full installation instructions, and includes how to set up Python virtual environments.
 
 
 ## What are the main features of Kedro?
@@ -49,9 +49,9 @@ Our [Get Started guide](https://kedro.readthedocs.io/en/stable/02_get_started/01
 ## How do I use Kedro?
 
 The [Kedro documentation](https://kedro.readthedocs.io/en/stable/) includes three examples to help get you started:
-- A typical "Hello World" example, for an [entry-level description of the main Kedro concepts](https://kedro.readthedocs.io/en/stable/02_get_started/03_hello_kedro.html)
-- An [introduction to the project template](https://kedro.readthedocs.io/en/stable/02_get_started/05_example_project.html) using the Iris dataset
-- A more detailed [spaceflights tutorial](https://kedro.readthedocs.io/en/stable/03_tutorial/02_tutorial_template.html) to give you hands-on experience
+- A typical "Hello World" example, for an [entry-level description of the main Kedro concepts](https://kedro.readthedocs.io/en/stable/get_started/hello_kedro.html)
+- An [introduction to the project template](https://kedro.readthedocs.io/en/stable/get_started/example_project.html) using the Iris dataset
+- A more detailed [spaceflights tutorial](https://kedro.readthedocs.io/en/stable/tutorial/tutorial_template.html) to give you hands-on experience
 
 
 ## Why does Kedro exist?
@@ -66,7 +66,7 @@ Kedro is built upon our collective best-practice (and mistakes) trying to delive
 
 ## The humans behind Kedro
 
-Kedro is maintained by [a product team](https://kedro.readthedocs.io/en/stable/12_faq/01_faq.html) and a number of [contributors from across the world](https://github.com/kedro-org/kedro/releases).
+Kedro is maintained by [a product team](https://kedro.readthedocs.io/en/stable/faq/faq.html) and a number of [contributors from across the world](https://github.com/kedro-org/kedro/releases).
 
 
 ## Can I contribute?
@@ -76,7 +76,7 @@ Yes! Want to help build Kedro? Check out our [guide to contributing to Kedro](ht
 
 ## Where can I learn more?
 
-There is a growing community around Kedro. Have a look at the [Kedro FAQs](https://kedro.readthedocs.io/en/stable/12_faq/01_faq.html#how-can-i-find-out-more-about-kedro) to find projects using Kedro and links to articles, podcasts and talks.
+There is a growing community around Kedro. Have a look at the [Kedro FAQs](https://kedro.readthedocs.io/en/stable/faq/faq.html#how-can-i-find-out-more-about-kedro) to find projects using Kedro and links to articles, podcasts and talks.
 
 
 ## Who likes Kedro?