From 8afb21ea1c03e33598edf48a87a2f978f4bb2d25 Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:11:03 -0400 Subject: [PATCH 01/15] ci: install the plugin alongside test requirements --- .circleci/continue_config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 82653758e..d339e82c1 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -69,8 +69,7 @@ commands: command: | cd <> pip install git+https://github.com/kedro-org/kedro@main - pip install . - pip install -r test_requirements.txt + pip install . -r test_requirements.txt # TODO(deepyaman): Define `test` extra and `pip install .[test]` - run: name: Install pre-commit hooks command: | @@ -177,7 +176,7 @@ commands: command: conda activate kedro_plugins; pip install git+https://github.com/kedro-org/kedro@main - run: name: Install all requirements - command: conda activate kedro_plugins; cd <>; pip install -r test_requirements.txt -U + command: conda activate kedro_plugins; cd <>; pip install . -r test_requirements.txt # TODO(deepyaman): Define `test` extra and `pip install .[test]` - run: name: Pip freeze command: conda activate kedro_plugins; pip freeze @@ -323,7 +322,7 @@ jobs: - run: name: Maybe trigger the release workflow command: | - conda activate kedro_plugins; + conda activate kedro_plugins pip install requests ./tools/circleci/circleci_release.py From 5e19c2f2dfe4cb6addfff8a41812458dd7dbf1e9 Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:13:09 -0400 Subject: [PATCH 02/15] ci: install the plugin alongside test requirements --- .github/workflows/check-plugin.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-plugin.yml b/.github/workflows/check-plugin.yml index 4a3cf8827..29266046d 100644 --- a/.github/workflows/check-plugin.yml +++ b/.github/workflows/check-plugin.yml @@ -42,7 +42,7 @@ jobs: - name: Install dependencies run: | cd ${{ inputs.plugin }} - pip install -r test_requirements.txt + pip install . -r test_requirements.txt # TODO(deepyaman): Define `test` extra and `pip install .[test]` - name: pip freeze run: pip freeze - name: Run unit tests for Linux / all plugins @@ -84,7 +84,7 @@ jobs: run: | cd ${{ inputs.plugin }} pip install git+https://github.com/kedro-org/kedro@main - pip install -r test_requirements.txt + pip install . -r test_requirements.txt # TODO(deepyaman): Define `test` extra and `pip install .[test]` pip freeze - name: Install pre-commit hooks run: | @@ -121,7 +121,7 @@ jobs: run: | cd ${{ inputs.plugin }} pip install git+https://github.com/kedro-org/kedro@main - pip install -r test_requirements.txt + pip install . -r test_requirements.txt # TODO(deepyaman): Define `test` extra and `pip install .[test]` - name: pip freeze run: pip freeze - name: Run end to end tests From e08cc0403c27a44483929ddb773b31b3741cf81c Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:15:50 -0400 Subject: [PATCH 03/15] Update kedro-airflow.yml --- .github/workflows/kedro-airflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kedro-airflow.yml b/.github/workflows/kedro-airflow.yml index b68fcce30..0b87548cd 100644 --- a/.github/workflows/kedro-airflow.yml +++ b/.github/workflows/kedro-airflow.yml @@ -1,4 +1,4 @@ -name: Run checks on kedro-airflow +name: Run checks on Kedro-Airflow on: push: From e86847a963961381804cbf611698e3892982f71b Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:16:05 -0400 Subject: [PATCH 04/15] Update kedro-datasets.yml --- .github/workflows/kedro-datasets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kedro-datasets.yml b/.github/workflows/kedro-datasets.yml index 9ff4802b6..5749f2362 100644 --- a/.github/workflows/kedro-datasets.yml +++ b/.github/workflows/kedro-datasets.yml @@ -1,4 +1,4 @@ -name: Run checks on kedro-datasets +name: Run checks on Kedro-Datasets on: push: From 0096661e3099de6945116ab48fb14ecd720a4ac3 Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:16:16 -0400 Subject: [PATCH 05/15] Update kedro-docker.yml --- .github/workflows/kedro-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kedro-docker.yml b/.github/workflows/kedro-docker.yml index 1812a3a93..a943e8de0 100644 --- a/.github/workflows/kedro-docker.yml +++ b/.github/workflows/kedro-docker.yml @@ -1,4 +1,4 @@ -name: Run checks on kedro-docker +name: Run checks on Kedro-Docker on: push: From fbb6fba291f76ffe8f649d1d47a82ef54fc79591 Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:16:28 -0400 Subject: [PATCH 06/15] Update kedro-telemetry.yml --- .github/workflows/kedro-telemetry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kedro-telemetry.yml b/.github/workflows/kedro-telemetry.yml index fd75e8a71..4920588cd 100644 --- a/.github/workflows/kedro-telemetry.yml +++ b/.github/workflows/kedro-telemetry.yml @@ -1,4 +1,4 @@ -name: Run checks on kedro-telemetry +name: Run checks on Kedro-Telemetry on: push: From 23bd16a27f403ea5a1b3cfedfe2eb41b70303f3d Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:19:08 -0400 Subject: [PATCH 07/15] Update kedro-airflow.yml --- .github/workflows/kedro-airflow.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/kedro-airflow.yml b/.github/workflows/kedro-airflow.yml index 0b87548cd..dc0a0c1fd 100644 --- a/.github/workflows/kedro-airflow.yml +++ b/.github/workflows/kedro-airflow.yml @@ -2,11 +2,15 @@ name: Run checks on Kedro-Airflow on: push: - paths: - - "kedro-airflow/**" + paths-ignore: + - "kedro-docker/**" + - "kedro-datasets/**" + - "kedro-telemetry/**" pull_request: - paths: - - "kedro-airflow/**" + paths-ignore: + - "kedro-docker/**" + - "kedro-datasets/**" + - "kedro-telemetry/**" types: [ synchronize ] jobs: From 4a51f12eb88d5e924e8eaa46b53d2383fbee11e7 Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:19:44 -0400 Subject: [PATCH 08/15] Update kedro-datasets.yml --- .github/workflows/kedro-datasets.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/kedro-datasets.yml b/.github/workflows/kedro-datasets.yml index 5749f2362..1b25f711b 100644 --- a/.github/workflows/kedro-datasets.yml +++ b/.github/workflows/kedro-datasets.yml @@ -2,11 +2,15 @@ name: Run checks on Kedro-Datasets on: push: - paths: - - "kedro-datasets/**" + paths-ignore: + - "kedro-airflow/**" + - "kedro-docker/**" + - "kedro-telemetry/**" pull_request: - paths: - - "kedro-datasets/**" + paths-ignore: + - "kedro-airflow/**" + - "kedro-docker/**" + - "kedro-telemetry/**" types: [ synchronize ] jobs: From 2a840475f3f6bc1b4bf9e219db134ccc1795681e Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:20:03 -0400 Subject: [PATCH 09/15] Update kedro-airflow.yml --- .github/workflows/kedro-airflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kedro-airflow.yml b/.github/workflows/kedro-airflow.yml index dc0a0c1fd..d4e696061 100644 --- a/.github/workflows/kedro-airflow.yml +++ b/.github/workflows/kedro-airflow.yml @@ -3,13 +3,13 @@ name: Run checks on Kedro-Airflow on: push: paths-ignore: - - "kedro-docker/**" - "kedro-datasets/**" + - "kedro-docker/**" - "kedro-telemetry/**" pull_request: paths-ignore: - - "kedro-docker/**" - "kedro-datasets/**" + - "kedro-docker/**" - "kedro-telemetry/**" types: [ synchronize ] From 87dce76c2441c8ef285f3b14e85325845dfc1c5b Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:20:52 -0400 Subject: [PATCH 10/15] Update kedro-docker.yml --- .github/workflows/kedro-docker.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/kedro-docker.yml b/.github/workflows/kedro-docker.yml index a943e8de0..4231ca545 100644 --- a/.github/workflows/kedro-docker.yml +++ b/.github/workflows/kedro-docker.yml @@ -2,11 +2,15 @@ name: Run checks on Kedro-Docker on: push: - paths: - - "kedro-docker/**" + paths-ignore: + - "kedro-airflow/**" + - "kedro-datasets/**" + - "kedro-telemetry/**" pull_request: - paths: - - "kedro-docker/**" + paths-ignore: + - "kedro-airflow/**" + - "kedro-datasets/**" + - "kedro-telemetry/**" types: [ synchronize ] jobs: From e55ef96764c1bed3084a95d2fca3398cd2d2e508 Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 12:21:11 -0400 Subject: [PATCH 11/15] Update kedro-telemetry.yml --- .github/workflows/kedro-telemetry.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/kedro-telemetry.yml b/.github/workflows/kedro-telemetry.yml index 4920588cd..ce5b82743 100644 --- a/.github/workflows/kedro-telemetry.yml +++ b/.github/workflows/kedro-telemetry.yml @@ -2,11 +2,15 @@ name: Run checks on Kedro-Telemetry on: push: - paths: - - "kedro-telemetry/**" + paths-ignore: + - "kedro-airflow/**" + - "kedro-datasets/**" + - "kedro-docker/**" pull_request: - paths: - - "kedro-telemetry/**" + paths-ignore: + - "kedro-airflow/**" + - "kedro-datasets/**" + - "kedro-docker/**" types: [ synchronize ] jobs: From 499a17776325f091cfb3d40c669081798a68d9d3 Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 13:16:40 -0400 Subject: [PATCH 12/15] ci(telemetry): update isort config to correct sort --- kedro-telemetry/pyproject.toml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/kedro-telemetry/pyproject.toml b/kedro-telemetry/pyproject.toml index 0cc754854..f6c53159c 100644 --- a/kedro-telemetry/pyproject.toml +++ b/kedro-telemetry/pyproject.toml @@ -37,11 +37,5 @@ readme = {file = "README.md", content-type = "text/markdown"} version = {attr = "kedro_telemetry.__version__"} [tool.isort] -multi_line_output = 3 -include_trailing_comma = true -force_grid_wrap = 0 -use_parentheses = true -line_length = 88 -known_third_party = "kedro" - -[tool.black] +profile = "black" +known_first_party = "kedro_telemetry" From e75a4abd53481cf160b9c887081ad61c99e94dd6 Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 13:25:34 -0400 Subject: [PATCH 13/15] =?UTF-8?q?Don't=20use=20profile=20=C2=AF\=5F(?= =?UTF-8?q?=E3=83=84)=5F/=C2=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Deepyaman Datta --- kedro-telemetry/pyproject.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kedro-telemetry/pyproject.toml b/kedro-telemetry/pyproject.toml index f6c53159c..81ec2c60b 100644 --- a/kedro-telemetry/pyproject.toml +++ b/kedro-telemetry/pyproject.toml @@ -37,5 +37,9 @@ readme = {file = "README.md", content-type = "text/markdown"} version = {attr = "kedro_telemetry.__version__"} [tool.isort] -profile = "black" +multi_line_output = 3 +include_trailing_comma = true +force_grid_wrap = 0 +use_parentheses = true +line_length = 88 known_first_party = "kedro_telemetry" From bf180c2bc80d6ae61ad899fc474c73d615f8302a Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 14:06:19 -0400 Subject: [PATCH 14/15] chore(datasets): remove empty `tool.black` section --- kedro-datasets/pyproject.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/kedro-datasets/pyproject.toml b/kedro-datasets/pyproject.toml index a5f494106..11cf1a157 100644 --- a/kedro-datasets/pyproject.toml +++ b/kedro-datasets/pyproject.toml @@ -27,8 +27,6 @@ include = ["kedro_datasets*"] readme = {file = "README.md", content-type = "text/markdown"} version = {attr = "kedro_datasets.__version__"} -[tool.black] - [tool.isort] profile = "black" From 0aac8814e373c564c1610d7d112fe392a4bfcdbd Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Wed, 17 May 2023 14:06:48 -0400 Subject: [PATCH 15/15] chore(docker): remove empty `tool.black` section --- kedro-docker/pyproject.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/kedro-docker/pyproject.toml b/kedro-docker/pyproject.toml index cdd273509..0a9639956 100644 --- a/kedro-docker/pyproject.toml +++ b/kedro-docker/pyproject.toml @@ -53,8 +53,6 @@ addopts = """ --no-cov-on-fail -ra""" -[tool.black] - [tool.isort] multi_line_output = 3 include_trailing_comma = true