From ffdd833f8ec8cbdd6aca70fba3de402d59c4fcde Mon Sep 17 00:00:00 2001 From: Alan Chin Date: Fri, 31 Mar 2023 15:58:57 -0700 Subject: [PATCH 1/3] Defer processor loading until runtimes are determined Signed-off-by: Alan Chin --- elyra/pipeline/registry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elyra/pipeline/registry.py b/elyra/pipeline/registry.py index 8c519ebdc..f509095a7 100644 --- a/elyra/pipeline/registry.py +++ b/elyra/pipeline/registry.py @@ -57,8 +57,8 @@ def __init__(self, **kwargs): for processor in entrypoints.get_group_all("elyra.pipeline.processors"): try: # instantiate an actual instance of the processor - processor_instance = processor.load()(root_dir=self.root_dir, parent=kwargs.get("parent")) if not self.runtimes or processor.name in self.runtimes: + processor_instance = processor.load()(root_dir=self.root_dir, parent=kwargs.get("parent")) self._add_processor(processor_instance) else: self.log.info( From dbf1a49664afe590af2b532b8dc7c493df10d731 Mon Sep 17 00:00:00 2001 From: Alan Chin Date: Fri, 31 Mar 2023 16:01:13 -0700 Subject: [PATCH 2/3] Move kfp into optional dependencies Signed-off-by: Alan Chin --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9d2cf541f..b8eb3ce00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,6 @@ dependencies = [ "watchdog>=2.1.3", "websocket-client", "yaspin", - "kfp>=1.7.0,<2.0,!=1.7.2", # We cap the SDK to <2.0 due to possible breaking changes "pygithub", "black>=22.8.0", ] @@ -85,6 +84,10 @@ test = [ "requests-unixsocket", "kfp-tekton" ] +kfp = [ + "kfp>=1.7.0,<2.0,!=1.7.2", # We cap the SDK to <2.0 due to possible breaking changes +] + kfp-tekton = [ "kfp-tekton>=1.5.2" # requires kfp >= 1.8.19, which contains fix for Jupyterlab ] From f87c52e72443997e7e854a8f4dcadc0a5eaee067 Mon Sep 17 00:00:00 2001 From: Alan Chin Date: Mon, 3 Apr 2023 09:13:23 -0700 Subject: [PATCH 3/3] Move other dep into kfp optional Signed-off-by: Alan Chin --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b8eb3ce00..265ebeabd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ dependencies = [ "rfc3986-validator>=0.1.1", "tornado>=6.1.0", "traitlets>=4.3.2", - "typing-extensions>=3.10,<5", # Cap from kfp + "typing-extensions>=3.10", "urllib3>=1.26.5", "watchdog>=2.1.3", "websocket-client", @@ -86,6 +86,7 @@ test = [ ] kfp = [ "kfp>=1.7.0,<2.0,!=1.7.2", # We cap the SDK to <2.0 due to possible breaking changes + "typing-extensions>=3.10,<5", # Cap from kfp ] kfp-tekton = [ @@ -99,9 +100,11 @@ gitlab = [ ] # The following is a collection of "non-test" extra dependencies from above. all = [ + "kfp>=1.7.0,<2.0,!=1.7.2", # We cap the SDK to <2.0 due to possible breaking changes "kfp-tekton>=1.5.2", "elyra-examples-kfp-catalog", "python-gitlab", + "typing-extensions>=3.10,<5", # Cap from kfp ] # Console scripts