From cfdfc1136abd9474f6470bba904a419f77cf0ad9 Mon Sep 17 00:00:00 2001 From: Dmitry Sorokin Date: Wed, 20 Dec 2023 21:22:15 +0000 Subject: [PATCH 1/3] Remove setuptools Signed-off-by: Dmitry Sorokin --- kedro/framework/cli/micropkg.py | 9 +++++---- pyproject.toml | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kedro/framework/cli/micropkg.py b/kedro/framework/cli/micropkg.py index dcdfc5d99e..09fdfe7ef8 100644 --- a/kedro/framework/cli/micropkg.py +++ b/kedro/framework/cli/micropkg.py @@ -21,7 +21,6 @@ from rope.contrib import generate from rope.refactor.move import MoveModule from rope.refactor.rename import Rename -from setuptools.discovery import FlatLayoutPackageFinder from build.util import project_wheel_metadata from kedro.framework.cli.pipeline import ( @@ -227,9 +226,11 @@ def _pull_package( # noqa: PLR0913 # However, the rest of the code expects the non-normalized package name, # so we have to find it. packages = [ - package - for package in FlatLayoutPackageFinder().find(project_root_dir) - if "." not in package + elem.name + for elem in project_root_dir.iterdir() + if elem.is_dir() + and elem.name != "tests" + and (elem / "__init__.py").exists() ] if len(packages) != 1: # Should not happen if user is calling `micropkg pull` diff --git a/pyproject.toml b/pyproject.toml index d0f024700a..ee63ae5316 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,6 @@ dependencies = [ "PyYAML>=4.2,<7.0", "rich>=12.0,<14.0", "rope>=0.21,<2.0", # subject to LGPLv3 license - "setuptools>=65.5.1", "toml>=0.10.0", "toposort>=1.5", # Needs to be at least 1.5 to be able to raise CircularDependencyError ] From 6e54a8946e881522d001adf027be035b5eecd719 Mon Sep 17 00:00:00 2001 From: Dmitry Sorokin Date: Thu, 21 Dec 2023 09:41:22 +0000 Subject: [PATCH 2/3] Fix elen name Signed-off-by: Dmitry Sorokin --- kedro/framework/cli/micropkg.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kedro/framework/cli/micropkg.py b/kedro/framework/cli/micropkg.py index 09fdfe7ef8..6002f8f9d7 100644 --- a/kedro/framework/cli/micropkg.py +++ b/kedro/framework/cli/micropkg.py @@ -226,11 +226,11 @@ def _pull_package( # noqa: PLR0913 # However, the rest of the code expects the non-normalized package name, # so we have to find it. packages = [ - elem.name - for elem in project_root_dir.iterdir() - if elem.is_dir() - and elem.name != "tests" - and (elem / "__init__.py").exists() + project_item.name + for project_item in project_root_dir.iterdir() + if project_item.is_dir() + and project_item.name != "tests" + and (project_item / "__init__.py").exists() ] if len(packages) != 1: # Should not happen if user is calling `micropkg pull` From 56af5c11348c00c3e250fc9d86001842edb22181 Mon Sep 17 00:00:00 2001 From: Dmitry Sorokin Date: Thu, 21 Dec 2023 09:56:25 +0000 Subject: [PATCH 3/3] Update release.md Signed-off-by: Dmitry Sorokin --- RELEASE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE.md b/RELEASE.md index 901100e061..6273792449 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,6 +5,7 @@ ## Bug fixes and other changes * Removed example pipeline requirements when examples are not selected in `tools`. * Allowed modern versions of JupyterLab and Jupyter Notebooks. +* Removed setuptools dependency ## Breaking changes to the API * Added logging about not using async mode in `SequentiallRunner` and `ParallelRunner`.