From 5dee0257bdea67cc7288073b1ef88367d4ba4311 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 14:00:12 -0300 Subject: [PATCH 01/35] Changes to pyproject.toml template Signed-off-by: Laura Couto --- .../{{ cookiecutter.repo_name }}/pyproject.toml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml index b2ab54c3bb..dde301c045 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml @@ -5,7 +5,13 @@ build-backend = "setuptools.build_meta" [project] name = "{{ cookiecutter.python_package }}" readme = "README.md" -dynamic = ["dependencies", "version"] +dynamic = ["version"] +dependencies = [ + "ipython>=8.10", + "jupyterlab>=3.0", + "notebook", + "kedro~={{ cookiecutter.kedro_version }}" +] [project.scripts] {{ cookiecutter.repo_name }} = "{{ cookiecutter.python_package }}.__main__:main" @@ -31,9 +37,7 @@ dev = [ "ruff~=0.1.8" ] - [tool.setuptools.dynamic] -dependencies = {file = "requirements.txt"} version = {attr = "{{ cookiecutter.python_package }}.__version__"} [tool.setuptools.packages.find] From 3b29e3756e5ff173a930411fc36076e5305fbfe0 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 21:52:03 -0300 Subject: [PATCH 02/35] add requires-python to pyproject.toml Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/pyproject.toml | 1 + .../project/{{ cookiecutter.repo_name }}/requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml index dde301c045..8c9d2a3852 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml @@ -3,6 +3,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] +requires-python = ">=3.9" name = "{{ cookiecutter.python_package }}" readme = "README.md" dynamic = ["version"] diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 1be43016fb..3f243e0ad5 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,3 +2,4 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} +pip install -e . \ No newline at end of file From 74c694d9aaccf2a12ffa2ac0afac77e3e209c1ab Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 21:57:04 -0300 Subject: [PATCH 03/35] Lint Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 3f243e0ad5..28a1ad8aae 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,4 +2,4 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} -pip install -e . \ No newline at end of file +pip install -e . From 22e707ac642a8d55e1aa5b7657d458767714b6c1 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 22:16:41 -0300 Subject: [PATCH 04/35] Failing test Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 28a1ad8aae..1be43016fb 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,4 +2,3 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} -pip install -e . From 4b5f26888df21ad109d8d5584abee12075a1f48a Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 23:11:06 -0300 Subject: [PATCH 05/35] Change requirements.txt to -e . Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 1be43016fb..d6e1198b1a 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -1,4 +1 @@ -ipython>=8.10 -jupyterlab>=3.0 -notebook -kedro~={{ cookiecutter.kedro_version }} +-e . From aef91fcdaaea100557c4191e1f20d0b14004c5d2 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 23:14:00 -0300 Subject: [PATCH 06/35] Revert Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index d6e1198b1a..1be43016fb 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -1 +1,4 @@ --e . +ipython>=8.10 +jupyterlab>=3.0 +notebook +kedro~={{ cookiecutter.kedro_version }} From 876c0c72acb2f48093a955223598e3e2099bb22c Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 14:00:12 -0300 Subject: [PATCH 07/35] Changes to pyproject.toml template Signed-off-by: Laura Couto --- .../{{ cookiecutter.repo_name }}/pyproject.toml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml index b2ab54c3bb..dde301c045 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml @@ -5,7 +5,13 @@ build-backend = "setuptools.build_meta" [project] name = "{{ cookiecutter.python_package }}" readme = "README.md" -dynamic = ["dependencies", "version"] +dynamic = ["version"] +dependencies = [ + "ipython>=8.10", + "jupyterlab>=3.0", + "notebook", + "kedro~={{ cookiecutter.kedro_version }}" +] [project.scripts] {{ cookiecutter.repo_name }} = "{{ cookiecutter.python_package }}.__main__:main" @@ -31,9 +37,7 @@ dev = [ "ruff~=0.1.8" ] - [tool.setuptools.dynamic] -dependencies = {file = "requirements.txt"} version = {attr = "{{ cookiecutter.python_package }}.__version__"} [tool.setuptools.packages.find] From 2c60ff5601caeb90dc4c02870da4e051bf1f626d Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 21:52:03 -0300 Subject: [PATCH 08/35] add requires-python to pyproject.toml Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/pyproject.toml | 1 + .../project/{{ cookiecutter.repo_name }}/requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml index dde301c045..8c9d2a3852 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml @@ -3,6 +3,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] +requires-python = ">=3.9" name = "{{ cookiecutter.python_package }}" readme = "README.md" dynamic = ["version"] diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 1be43016fb..3f243e0ad5 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,3 +2,4 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} +pip install -e . \ No newline at end of file From f9f40fec54d1c5b54c2a55fa6e1c19a48350f327 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 21:57:04 -0300 Subject: [PATCH 09/35] Lint Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 3f243e0ad5..28a1ad8aae 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,4 +2,4 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} -pip install -e . \ No newline at end of file +pip install -e . From 2cf197fc285a5daf8ec4761252e74705b49c44ef Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 22:16:41 -0300 Subject: [PATCH 10/35] Failing test Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 28a1ad8aae..1be43016fb 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,4 +2,3 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} -pip install -e . From 97585374ceb53d2415221bb8afb9030b198214aa Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 23:11:06 -0300 Subject: [PATCH 11/35] Change requirements.txt to -e . Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 1be43016fb..d6e1198b1a 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -1,4 +1 @@ -ipython>=8.10 -jupyterlab>=3.0 -notebook -kedro~={{ cookiecutter.kedro_version }} +-e . From e86dad4afdd816de4899b6e9a4b4baa0798f757a Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 23:14:00 -0300 Subject: [PATCH 12/35] Revert Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index d6e1198b1a..1be43016fb 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -1 +1,4 @@ --e . +ipython>=8.10 +jupyterlab>=3.0 +notebook +kedro~={{ cookiecutter.kedro_version }} From 61f4d8abd9969f8dbbc2f1b08ad52837d1356855 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Wed, 6 Nov 2024 15:46:43 -0300 Subject: [PATCH 13/35] Formatting on cookiecutter placeholders on default template Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml index 8c9d2a3852..02eac94ae0 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [project.scripts] -{{ cookiecutter.repo_name }} = "{{ cookiecutter.python_package }}.__main__:main" +"{{ cookiecutter.repo_name }}" = "{{ cookiecutter.python_package }}.__main__:main" [project.entry-points."kedro.hooks"] @@ -49,7 +49,7 @@ namespaces = false package_name = "{{ cookiecutter.python_package }}" project_name = "{{ cookiecutter.project_name }}" kedro_init_version = "{{ cookiecutter.kedro_version }}" -tools = {{ cookiecutter.tools | default('') | string | replace('\"', '\\\"') }} +tools = "{{ cookiecutter.tools | default('') | string | replace('\"', '\\\"') }}" example_pipeline = "{{ cookiecutter.example_pipeline }}" source_dir = "src" From cc1ec630d6616ff431f1f7b0336cf099f5589aa1 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Thu, 7 Nov 2024 19:37:13 -0300 Subject: [PATCH 14/35] Add change to release notes Signed-off-by: Laura Couto --- RELEASE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE.md b/RELEASE.md index 2599688a4a..2b6800a797 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -3,6 +3,7 @@ ## Major features and improvements * Implemented dict-like interface for `KedroDataCatalog`. * Implemented lazy dataset initializing for `KedroDataCatalog`. +* Project dependencies on both the default template and on starter templates are now explicitly declared on the `pyproject.toml` file. **Note:** ``KedroDataCatalog`` is an experimental feature and is under active development. Therefore, it is possible we'll introduce breaking changes to this class, so be mindful of that if you decide to use it already. Let us know if you have any feedback about the ``KedroDataCatalog`` or ideas for new features. From 12af507a13cd10e2e08dc98ac1e15e41b8b0ad45 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Thu, 7 Nov 2024 21:12:52 -0300 Subject: [PATCH 15/35] Elaborate on release notes Signed-off-by: Laura Couto --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 2b6800a797..a8ebca4ca6 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -3,7 +3,7 @@ ## Major features and improvements * Implemented dict-like interface for `KedroDataCatalog`. * Implemented lazy dataset initializing for `KedroDataCatalog`. -* Project dependencies on both the default template and on starter templates are now explicitly declared on the `pyproject.toml` file. +* Project dependencies on both the default template and on starter templates are now explicitly declared on the `pyproject.toml` file, allowing Kedro projects to work with project management tools like `uv`, `pdm`, and `rye`. **Note:** ``KedroDataCatalog`` is an experimental feature and is under active development. Therefore, it is possible we'll introduce breaking changes to this class, so be mindful of that if you decide to use it already. Let us know if you have any feedback about the ``KedroDataCatalog`` or ideas for new features. From e972b41bd54f8c58313594131ab7d54bb8140f8a Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Tue, 12 Nov 2024 13:53:44 -0300 Subject: [PATCH 16/35] Update pyproject.toml on test_project Signed-off-by: Laura Couto --- .../{{ cookiecutter.repo_name }}/pyproject.toml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml index eb7cb5f113..e2c2515098 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml @@ -3,12 +3,19 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] +requires-python = ">=3.9" name = "{{ cookiecutter.python_package }}" readme = "README.md" -dynamic = ["dependencies", "version"] +dependencies = [ + "ipython>=8.10", + "jupyterlab>=3.0", + "notebook", + "kedro~={{ cookiecutter.kedro_version}}", + "kedro-datasets[pandas-csvdataset]" +] [project.scripts] -{{ cookiecutter.repo_name }} = "{{ cookiecutter.python_package }}.__main__:main" +"{{ cookiecutter.repo_name }}" = "{{ cookiecutter.python_package }}.__main__:main" [project.optional-dependencies] docs = [ @@ -30,7 +37,6 @@ dev = [ ] [tool.setuptools.dynamic] -dependencies = {file = "requirements.txt"} version = {attr = "{{ cookiecutter.python_package }}.__version__"} [tool.setuptools.packages.find] @@ -41,7 +47,7 @@ namespaces = false package_name = "{{ cookiecutter.python_package }}" project_name = "{{ cookiecutter.project_name }}" kedro_init_version = "{{ cookiecutter.kedro_version }}" -tools = {{ cookiecutter.tools | default('') | string | replace('\"', '\\\"') }} +tools = "{{ cookiecutter.tools | default('') | string | replace('\"', '\\\"') }}" example_pipeline = "{{ cookiecutter.example_pipeline }}" source_dir = "src" @@ -49,7 +55,7 @@ source_dir = "src" [tool.pytest.ini_options] addopts = """ --cov-report term-missing \ ---cov src/{{ cookiecutter.python_package }} -ra""" +--cov src/"{{ cookiecutter.python_package }}" -ra""" [tool.coverage.report] fail_under = 0 From ba71af2c5b4670b95cac811e4dca4de940a6f301 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Tue, 12 Nov 2024 14:23:55 -0300 Subject: [PATCH 17/35] Syntax issues Signed-off-by: Laura Couto --- .../test_starter/{{ cookiecutter.repo_name }}/pyproject.toml | 4 ++-- .../{{ cookiecutter.repo_name }}/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml index e2c2515098..34a47e74e0 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ "ipython>=8.10", "jupyterlab>=3.0", "notebook", - "kedro~={{ cookiecutter.kedro_version}}", + "kedro~={{ cookiecutter.kedro_version }}", "kedro-datasets[pandas-csvdataset]" ] @@ -55,7 +55,7 @@ source_dir = "src" [tool.pytest.ini_options] addopts = """ --cov-report term-missing \ ---cov src/"{{ cookiecutter.python_package }}" -ra""" +--cov src/{{ cookiecutter.python_package }} -ra""" [tool.coverage.report] fail_under = 0 diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt index 014df14d12..bc0a4b4d04 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt @@ -1,5 +1,5 @@ ipython>=8.10 jupyterlab>=3.0 notebook -kedro~={{ cookiecutter.kedro_version}} +kedro~={{ cookiecutter.kedro_version }} kedro-datasets[pandas-csvdataset] From 81597248ad6a79d2a12004c8fb8011fb3654e272 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 14:00:12 -0300 Subject: [PATCH 18/35] Changes to pyproject.toml template Signed-off-by: Laura Couto --- .../{{ cookiecutter.repo_name }}/pyproject.toml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml index b2ab54c3bb..dde301c045 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml @@ -5,7 +5,13 @@ build-backend = "setuptools.build_meta" [project] name = "{{ cookiecutter.python_package }}" readme = "README.md" -dynamic = ["dependencies", "version"] +dynamic = ["version"] +dependencies = [ + "ipython>=8.10", + "jupyterlab>=3.0", + "notebook", + "kedro~={{ cookiecutter.kedro_version }}" +] [project.scripts] {{ cookiecutter.repo_name }} = "{{ cookiecutter.python_package }}.__main__:main" @@ -31,9 +37,7 @@ dev = [ "ruff~=0.1.8" ] - [tool.setuptools.dynamic] -dependencies = {file = "requirements.txt"} version = {attr = "{{ cookiecutter.python_package }}.__version__"} [tool.setuptools.packages.find] From e6a6763087598287ce0487343872ac8fd8901a23 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 21:52:03 -0300 Subject: [PATCH 19/35] add requires-python to pyproject.toml Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/pyproject.toml | 1 + .../project/{{ cookiecutter.repo_name }}/requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml index dde301c045..8c9d2a3852 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml @@ -3,6 +3,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] +requires-python = ">=3.9" name = "{{ cookiecutter.python_package }}" readme = "README.md" dynamic = ["version"] diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 1be43016fb..3f243e0ad5 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,3 +2,4 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} +pip install -e . \ No newline at end of file From a799119dcd48b84259112146a25b76e1b8f0301a Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 21:57:04 -0300 Subject: [PATCH 20/35] Lint Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 3f243e0ad5..28a1ad8aae 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,4 +2,4 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} -pip install -e . \ No newline at end of file +pip install -e . From 6a5f1dbe5e46c245b65e416f36c369d34da1791b Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 22:16:41 -0300 Subject: [PATCH 21/35] Failing test Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 28a1ad8aae..1be43016fb 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,4 +2,3 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} -pip install -e . From 684159447591566660f2e14e1f49452d5dec4913 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 23:11:06 -0300 Subject: [PATCH 22/35] Change requirements.txt to -e . Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 1be43016fb..d6e1198b1a 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -1,4 +1 @@ -ipython>=8.10 -jupyterlab>=3.0 -notebook -kedro~={{ cookiecutter.kedro_version }} +-e . From 96a00e91f74e62ddcaf23bb6c49b4849b81be25f Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 23:14:00 -0300 Subject: [PATCH 23/35] Revert Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index d6e1198b1a..1be43016fb 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -1 +1,4 @@ --e . +ipython>=8.10 +jupyterlab>=3.0 +notebook +kedro~={{ cookiecutter.kedro_version }} From 6e3c197c0244bae78c782df4459126b48a4b3c78 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 21:52:03 -0300 Subject: [PATCH 24/35] add requires-python to pyproject.toml Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 1be43016fb..3f243e0ad5 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,3 +2,4 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} +pip install -e . \ No newline at end of file From d06304338b4bffd0af7a201c71d54ec070fc758c Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 21:57:04 -0300 Subject: [PATCH 25/35] Lint Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 3f243e0ad5..28a1ad8aae 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,4 +2,4 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} -pip install -e . \ No newline at end of file +pip install -e . From 1d332aa7d51a1c732e5880514811d949f846cfc5 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 22:16:41 -0300 Subject: [PATCH 26/35] Failing test Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 28a1ad8aae..1be43016fb 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -2,4 +2,3 @@ ipython>=8.10 jupyterlab>=3.0 notebook kedro~={{ cookiecutter.kedro_version }} -pip install -e . From d5a422e2114bfdfe2b7b43bd70a1d70d826608c9 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 23:11:06 -0300 Subject: [PATCH 27/35] Change requirements.txt to -e . Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index 1be43016fb..d6e1198b1a 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -1,4 +1 @@ -ipython>=8.10 -jupyterlab>=3.0 -notebook -kedro~={{ cookiecutter.kedro_version }} +-e . From 9308cdf8a2d68725a040c26b31ca0909f72c2632 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Mon, 28 Oct 2024 23:14:00 -0300 Subject: [PATCH 28/35] Revert Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt index d6e1198b1a..1be43016fb 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/requirements.txt @@ -1 +1,4 @@ --e . +ipython>=8.10 +jupyterlab>=3.0 +notebook +kedro~={{ cookiecutter.kedro_version }} From 43e9b30786a16b9158580a2748d302c2ae12326d Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Wed, 6 Nov 2024 15:46:43 -0300 Subject: [PATCH 29/35] Formatting on cookiecutter placeholders on default template Signed-off-by: Laura Couto --- .../project/{{ cookiecutter.repo_name }}/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml index 8c9d2a3852..02eac94ae0 100644 --- a/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/kedro/templates/project/{{ cookiecutter.repo_name }}/pyproject.toml @@ -15,7 +15,7 @@ dependencies = [ ] [project.scripts] -{{ cookiecutter.repo_name }} = "{{ cookiecutter.python_package }}.__main__:main" +"{{ cookiecutter.repo_name }}" = "{{ cookiecutter.python_package }}.__main__:main" [project.entry-points."kedro.hooks"] @@ -49,7 +49,7 @@ namespaces = false package_name = "{{ cookiecutter.python_package }}" project_name = "{{ cookiecutter.project_name }}" kedro_init_version = "{{ cookiecutter.kedro_version }}" -tools = {{ cookiecutter.tools | default('') | string | replace('\"', '\\\"') }} +tools = "{{ cookiecutter.tools | default('') | string | replace('\"', '\\\"') }}" example_pipeline = "{{ cookiecutter.example_pipeline }}" source_dir = "src" From a3cfb45a665581cff8ab7fecdc97dea71111c1f0 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Thu, 7 Nov 2024 19:37:13 -0300 Subject: [PATCH 30/35] Add change to release notes Signed-off-by: Laura Couto --- RELEASE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE.md b/RELEASE.md index 2599688a4a..2b6800a797 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -3,6 +3,7 @@ ## Major features and improvements * Implemented dict-like interface for `KedroDataCatalog`. * Implemented lazy dataset initializing for `KedroDataCatalog`. +* Project dependencies on both the default template and on starter templates are now explicitly declared on the `pyproject.toml` file. **Note:** ``KedroDataCatalog`` is an experimental feature and is under active development. Therefore, it is possible we'll introduce breaking changes to this class, so be mindful of that if you decide to use it already. Let us know if you have any feedback about the ``KedroDataCatalog`` or ideas for new features. From c2b32356a4a10ec1edd597083e786416e177d285 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Thu, 7 Nov 2024 21:12:52 -0300 Subject: [PATCH 31/35] Elaborate on release notes Signed-off-by: Laura Couto --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 2b6800a797..a8ebca4ca6 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -3,7 +3,7 @@ ## Major features and improvements * Implemented dict-like interface for `KedroDataCatalog`. * Implemented lazy dataset initializing for `KedroDataCatalog`. -* Project dependencies on both the default template and on starter templates are now explicitly declared on the `pyproject.toml` file. +* Project dependencies on both the default template and on starter templates are now explicitly declared on the `pyproject.toml` file, allowing Kedro projects to work with project management tools like `uv`, `pdm`, and `rye`. **Note:** ``KedroDataCatalog`` is an experimental feature and is under active development. Therefore, it is possible we'll introduce breaking changes to this class, so be mindful of that if you decide to use it already. Let us know if you have any feedback about the ``KedroDataCatalog`` or ideas for new features. From 832ad2da0e42eb9a42732fbd92c569d06044a100 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Tue, 12 Nov 2024 13:53:44 -0300 Subject: [PATCH 32/35] Update pyproject.toml on test_project Signed-off-by: Laura Couto --- .../{{ cookiecutter.repo_name }}/pyproject.toml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml index eb7cb5f113..e2c2515098 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml @@ -3,12 +3,19 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] +requires-python = ">=3.9" name = "{{ cookiecutter.python_package }}" readme = "README.md" -dynamic = ["dependencies", "version"] +dependencies = [ + "ipython>=8.10", + "jupyterlab>=3.0", + "notebook", + "kedro~={{ cookiecutter.kedro_version}}", + "kedro-datasets[pandas-csvdataset]" +] [project.scripts] -{{ cookiecutter.repo_name }} = "{{ cookiecutter.python_package }}.__main__:main" +"{{ cookiecutter.repo_name }}" = "{{ cookiecutter.python_package }}.__main__:main" [project.optional-dependencies] docs = [ @@ -30,7 +37,6 @@ dev = [ ] [tool.setuptools.dynamic] -dependencies = {file = "requirements.txt"} version = {attr = "{{ cookiecutter.python_package }}.__version__"} [tool.setuptools.packages.find] @@ -41,7 +47,7 @@ namespaces = false package_name = "{{ cookiecutter.python_package }}" project_name = "{{ cookiecutter.project_name }}" kedro_init_version = "{{ cookiecutter.kedro_version }}" -tools = {{ cookiecutter.tools | default('') | string | replace('\"', '\\\"') }} +tools = "{{ cookiecutter.tools | default('') | string | replace('\"', '\\\"') }}" example_pipeline = "{{ cookiecutter.example_pipeline }}" source_dir = "src" @@ -49,7 +55,7 @@ source_dir = "src" [tool.pytest.ini_options] addopts = """ --cov-report term-missing \ ---cov src/{{ cookiecutter.python_package }} -ra""" +--cov src/"{{ cookiecutter.python_package }}" -ra""" [tool.coverage.report] fail_under = 0 From 7a4a76791b20cf34c8848791c4f5dc61336a9ce9 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Tue, 12 Nov 2024 14:23:55 -0300 Subject: [PATCH 33/35] Syntax issues Signed-off-by: Laura Couto --- .../test_starter/{{ cookiecutter.repo_name }}/pyproject.toml | 4 ++-- .../{{ cookiecutter.repo_name }}/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml index e2c2515098..34a47e74e0 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ "ipython>=8.10", "jupyterlab>=3.0", "notebook", - "kedro~={{ cookiecutter.kedro_version}}", + "kedro~={{ cookiecutter.kedro_version }}", "kedro-datasets[pandas-csvdataset]" ] @@ -55,7 +55,7 @@ source_dir = "src" [tool.pytest.ini_options] addopts = """ --cov-report term-missing \ ---cov src/"{{ cookiecutter.python_package }}" -ra""" +--cov src/{{ cookiecutter.python_package }} -ra""" [tool.coverage.report] fail_under = 0 diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt index 014df14d12..bc0a4b4d04 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt @@ -1,5 +1,5 @@ ipython>=8.10 jupyterlab>=3.0 notebook -kedro~={{ cookiecutter.kedro_version}} +kedro~={{ cookiecutter.kedro_version }} kedro-datasets[pandas-csvdataset] From d63dccedfd4952436966b218591d2b695fa31060 Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Tue, 12 Nov 2024 16:28:41 -0300 Subject: [PATCH 34/35] Fix accidentally removed line Signed-off-by: Laura Couto --- .../test_starter/{{ cookiecutter.repo_name }}/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml index 34a47e74e0..ea11850fef 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml @@ -6,6 +6,7 @@ build-backend = "setuptools.build_meta" requires-python = ">=3.9" name = "{{ cookiecutter.python_package }}" readme = "README.md" +dynamic = ["version"] dependencies = [ "ipython>=8.10", "jupyterlab>=3.0", From 79ecef03fdfe0f2d74d4d6d386950cc87298b7bf Mon Sep 17 00:00:00 2001 From: Laura Couto Date: Tue, 12 Nov 2024 16:32:01 -0300 Subject: [PATCH 35/35] Fix duplicated line Signed-off-by: Laura Couto --- .../test_starter/{{ cookiecutter.repo_name }}/pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml index 615f8bfd7d..ea11850fef 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml @@ -4,7 +4,6 @@ build-backend = "setuptools.build_meta" [project] requires-python = ">=3.9" -requires-python = ">=3.9" name = "{{ cookiecutter.python_package }}" readme = "README.md" dynamic = ["version"]