From 41ea6cfebffaa47e4b6c588e2e113d3f104f634e Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Wed, 22 Nov 2023 07:44:33 +0100 Subject: [PATCH 1/5] Fix pyproject - TypeError: 'list' object is not a mapping --- ingestion/setup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ingestion/setup.py b/ingestion/setup.py index 3a8f6541328d..bf867446ab67 100644 --- a/ingestion/setup.py +++ b/ingestion/setup.py @@ -300,13 +300,13 @@ setup( install_requires=list(base_requirements), extras_require={ - "base": list(base_requirements), - "dev": list(dev), - "test": list(test), - "e2e_test": list(e2e_test), - "data-insight": list(plugins["elasticsearch"]), - **{plugin: list(dependencies) for (plugin, dependencies) in plugins.items()}, - "all": list( + "base": base_requirements, + "dev": dev, + "test": test, + "e2e_test": e2e_test, + "data-insight": plugins["elasticsearch"], + **{plugin: dependencies for (plugin, dependencies) in plugins.items()}, + "all": set( base_requirements.union( *[ requirements From c7fd3d4b5849887669a4d3c7dd01c6a3110a1a85 Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Wed, 22 Nov 2023 07:46:35 +0100 Subject: [PATCH 2/5] Add dynamic optional-dependencies --- ingestion/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ingestion/pyproject.toml b/ingestion/pyproject.toml index 9b6923a16abf..d9560e03ac22 100644 --- a/ingestion/pyproject.toml +++ b/ingestion/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" [project] name = "openmetadata-ingestion" version = "1.3.0.0.dev0" -dynamic = ["readme"] +dynamic = ["readme", "optional-dependencies"] authors = [ {name = "OpenMetadata Committers"} ] From 5c5e7a5530fca6e3611b487b8f88fec7ae2a9e16 Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Wed, 22 Nov 2023 07:47:40 +0100 Subject: [PATCH 3/5] Add dynamic optional-dependencies --- ingestion/setup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ingestion/setup.py b/ingestion/setup.py index bf867446ab67..3a8f6541328d 100644 --- a/ingestion/setup.py +++ b/ingestion/setup.py @@ -300,13 +300,13 @@ setup( install_requires=list(base_requirements), extras_require={ - "base": base_requirements, - "dev": dev, - "test": test, - "e2e_test": e2e_test, - "data-insight": plugins["elasticsearch"], - **{plugin: dependencies for (plugin, dependencies) in plugins.items()}, - "all": set( + "base": list(base_requirements), + "dev": list(dev), + "test": list(test), + "e2e_test": list(e2e_test), + "data-insight": list(plugins["elasticsearch"]), + **{plugin: list(dependencies) for (plugin, dependencies) in plugins.items()}, + "all": list( base_requirements.union( *[ requirements From 043056cf034eceecdaee64bf9261382b1c1571e4 Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Wed, 22 Nov 2023 08:01:10 +0100 Subject: [PATCH 4/5] Bump datamodel --- ingestion/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ingestion/setup.py b/ingestion/setup.py index 3a8f6541328d..e169ad8d180e 100644 --- a/ingestion/setup.py +++ b/ingestion/setup.py @@ -250,7 +250,7 @@ dev = { "black==22.3.0", - "datamodel-code-generator==0.22.0", + "datamodel-code-generator==0.24.2", "isort", "pre-commit", "pycln", From 5b66c628b7104a60cc6fbe78bbc2d2fa26f5616a Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Wed, 22 Nov 2023 08:17:22 +0100 Subject: [PATCH 5/5] Bump datamodel --- ingestion/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ingestion/pyproject.toml b/ingestion/pyproject.toml index d9560e03ac22..c5fb5c572eb6 100644 --- a/ingestion/pyproject.toml +++ b/ingestion/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools"] +requires = ["setuptools==69.0.2"] build-backend = "setuptools.build_meta" # We will keep handling dependencies in setup.py @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" [project] name = "openmetadata-ingestion" version = "1.3.0.0.dev0" -dynamic = ["readme", "optional-dependencies"] +dynamic = ["readme", "dependencies", "optional-dependencies"] authors = [ {name = "OpenMetadata Committers"} ]