Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO-MERGE] Merge main into develop via merge-main-to-develop #1151

Merged
merged 8 commits into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into merge-main-to-develop
# Conflicts:
#	README.md
#	RELEASE.md
#	docs/source/04_kedro_project_setup/04_mini_kedro.md
#	docs/source/07_extend_kedro/01_common_use_cases.md
#	docs/source/contribution/contribute_to_kedro.md
#	docs/source/deployment/aws_sagemaker.md
#	docs/source/deployment/single_machine.md
#	docs/source/extend_kedro/plugins.md
#	docs/source/faq/architecture_overview.md
#	docs/source/get_started/install.md
#	docs/source/get_started/prerequisites.md
#	docs/source/get_started/starters.md
#	docs/source/resources/glossary.md
#	docs/source/tutorial/spaceflights_tutorial.md
#	docs/source/tutorial/visualise_pipeline.md
#	kedro/io/data_catalog_with_default.py
#	kedro/versioning/journal.py
#	setup.py
  • Loading branch information
merelcht committed Jan 12, 2022
commit 4fe923f96ff0861338c7cf55c68a29ca6a034de1
45 changes: 22 additions & 23 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -459,31 +458,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:
Expand Down Expand Up @@ -532,7 +531,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

Expand All @@ -542,7 +541,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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ kedro.db
.*.swo
.*.swp

# Prettier
.prettierignore

.pytest_cache/
kedro/html
docs/tmp-build-artifacts
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: .
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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?
Expand All @@ -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?
Expand All @@ -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?
Expand All @@ -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?
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.