From 2963f2c70eefd1c4292f325ebed5a166d7f749a6 Mon Sep 17 00:00:00 2001 From: Michiel De Smet Date: Wed, 12 Feb 2025 14:23:22 +0800 Subject: [PATCH 1/3] Make datapilot namespaced --- setup.py | 5 +++-- src/datapilot/__init__.py | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 src/datapilot/__init__.py diff --git a/setup.py b/setup.py index be8a6f1..e8d25d7 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ import re from pathlib import Path -from setuptools import find_packages +from setuptools import find_namespace_packages from setuptools import setup @@ -23,8 +23,9 @@ def read(*names, **kwargs): author="Altimate Inc", author_email="info@altimate.ai", url="https://github.com/AltimateAI/datapilot-cli", - packages=find_packages("src"), + packages=find_namespace_packages(where="src"), # Use find_namespace_packages package_dir={"": "src"}, + namespace_packages=["datapilot"], py_modules=[path.stem for path in Path("src").glob("*.py")], include_package_data=True, zip_safe=False, diff --git a/src/datapilot/__init__.py b/src/datapilot/__init__.py deleted file mode 100644 index 6561790..0000000 --- a/src/datapilot/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "0.0.15" From 2e2b311871bf271bbd54d2c38cc5d4df72c82e68 Mon Sep 17 00:00:00 2001 From: Michiel De Smet Date: Wed, 12 Feb 2025 14:23:31 +0800 Subject: [PATCH 2/3] Add ingest command --- src/datapilot/cli/main.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/datapilot/cli/main.py b/src/datapilot/cli/main.py index 9e0cfb3..49bb504 100644 --- a/src/datapilot/cli/main.py +++ b/src/datapilot/cli/main.py @@ -9,3 +9,10 @@ def datapilot(): datapilot.add_command(dbt) + +try: + from datapilot.ingestion.cli import ingest + + datapilot.add_command(ingest) +except ImportError: + pass From b1afbf858fe2f5d543d8c7f0a19a8a8b442da189 Mon Sep 17 00:00:00 2001 From: Michiel De Smet Date: Thu, 6 Mar 2025 21:01:54 +0800 Subject: [PATCH 3/3] chore: Update version file path and add .aider* to .gitignore --- .bumpversion.cfg | 2 +- .gitignore | 1 + src/datapilot/cli/__init__.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b8e9e51..6cce395 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -11,6 +11,6 @@ replace = version="{new_version}" search = version = release = "{current_version}" replace = version = release = "{new_version}" -[bumpversion:file:src/datapilot/__init__.py] +[bumpversion:file:src/datapilot/cli/__init__.py] search = __version__ = "{current_version}" replace = __version__ = "{new_version}" diff --git a/.gitignore b/.gitignore index 77973dd..23bb0a1 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ docs/_build # Mypy Cache .mypy_cache/ +.aider* diff --git a/src/datapilot/cli/__init__.py b/src/datapilot/cli/__init__.py index e69de29..6561790 100644 --- a/src/datapilot/cli/__init__.py +++ b/src/datapilot/cli/__init__.py @@ -0,0 +1 @@ +__version__ = "0.0.15"