Move "include" directory to project (#1560)

# Description ## What is the current behavior? See the referenced issue for details. closes: #1440 ## What is the new behavior? After reading python-poetry/poetry#2015, it seems the best solution is to include the "include" directory directly in the project. ## Does this introduce a breaking change? No. ### Checklist - [x] Created tests which fail without the change (if possible) - [ ] Extended the README / documentation, if necessary
astronomer · Jan 17, 2023 · de97f0f · de97f0f
1 parent 34877aa
commit de97f0f
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,11 +53,8 @@ sql-cli/tests/.airflow/dags/*
 !sql-cli/tests/.airflow/dags/sql/.gitkeep
 !sql-cli/tests/.airflow/dags/.gitkeep
 
-# Generated examples
-sql-cli/include/base/.airflow/dags/*
-!sql-cli/include/base/.airflow/dags/include/.gitkeep
-!sql-cli/include/base/.airflow/dags/.gitkeep
-!/sql-cli/include/base/.env
+# Un-ignore .env file for sql-cli users
+!sql-cli/sql_cli/include/base/.env
 
 # Airflow
 **/.airflowignore

diff --git a/sql-cli/pyproject.toml b/sql-cli/pyproject.toml
@@ -20,9 +20,6 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
 ]
-include=[
-   { path = 'include', format = 'wheel' }
-]
 
 [project.urls]
 Home = "https://astronomer.io/"

diff --git a/sql-cli/include/base/.airflow/dags/.gitkeep → ...l_cli/include/base/.airflow/dags/.gitkeep b/sql-cli/include/base/.airflow/dags/.gitkeep → ...l_cli/include/base/.airflow/dags/.gitkeep
diff --git a/...clude/base/.airflow/dags/include/.gitkeep → ...clude/base/.airflow/dags/include/.gitkeep b/...clude/base/.airflow/dags/include/.gitkeep → ...clude/base/.airflow/dags/include/.gitkeep
diff --git a/...li/include/base/.airflow/default/.gitkeep → ...li/include/base/.airflow/default/.gitkeep b/...li/include/base/.airflow/default/.gitkeep → ...li/include/base/.airflow/default/.gitkeep
diff --git a/sql-cli/include/base/.airflow/dev/.gitkeep → ...ql_cli/include/base/.airflow/dev/.gitkeep b/sql-cli/include/base/.airflow/dev/.gitkeep → ...ql_cli/include/base/.airflow/dev/.gitkeep
diff --git a/sql-cli/include/base/.env → sql-cli/sql_cli/include/base/.env b/sql-cli/include/base/.env → sql-cli/sql_cli/include/base/.env
diff --git a/...ude/base/config/default/configuration.yml → ...ude/base/config/default/configuration.yml b/...ude/base/config/default/configuration.yml → ...ude/base/config/default/configuration.yml
diff --git a/...include/base/config/dev/configuration.yml → ...include/base/config/dev/configuration.yml b/...include/base/config/dev/configuration.yml → ...include/base/config/dev/configuration.yml
diff --git a/sql-cli/include/base/config/global.yml → ...li/sql_cli/include/base/config/global.yml b/sql-cli/include/base/config/global.yml → ...li/sql_cli/include/base/config/global.yml
diff --git a/sql-cli/include/base/data/imdb.db → sql-cli/sql_cli/include/base/data/imdb.db b/sql-cli/include/base/data/imdb.db → sql-cli/sql_cli/include/base/data/imdb.db
diff --git a/sql-cli/include/base/data/retail.db → sql-cli/sql_cli/include/base/data/retail.db b/sql-cli/include/base/data/retail.db → sql-cli/sql_cli/include/base/data/retail.db
diff --git a/...xample_basic_transform/top_animations.sql → ...xample_basic_transform/top_animations.sql b/...xample_basic_transform/top_animations.sql → ...xample_basic_transform/top_animations.sql
diff --git a/...s/example_load_file/load_imdb_movies.yaml → ...s/example_load_file/load_imdb_movies.yaml b/...s/example_load_file/load_imdb_movies.yaml → ...s/example_load_file/load_imdb_movies.yaml
diff --git a/...ample_load_file/transform_imdb_movies.sql → ...ample_load_file/transform_imdb_movies.sql b/...ample_load_file/transform_imdb_movies.sql → ...ample_load_file/transform_imdb_movies.sql
diff --git a/...ws/example_templating/filtered_orders.sql → ...ws/example_templating/filtered_orders.sql b/...ws/example_templating/filtered_orders.sql → ...ws/example_templating/filtered_orders.sql
diff --git a/...ple_templating/joint_orders_customers.sql → ...ple_templating/joint_orders_customers.sql b/...ple_templating/joint_orders_customers.sql → ...ple_templating/joint_orders_customers.sql
diff --git a/sql-cli/sql_cli/project.py b/sql-cli/sql_cli/project.py
@@ -23,7 +23,7 @@
     remove_unnecessary_files,
 )
 
-BASE_SOURCE_DIR = Path(os.path.realpath(__file__)).parent.parent / "include/base/"
+BASE_SOURCE_DIR = Path(os.path.realpath(__file__)).parent / "include/base/"
 
 MANDATORY_PATHS = {
     Path("config/default/configuration.yml"),

diff --git a/sql-cli/tests/test_configuration.py b/sql-cli/tests/test_configuration.py
@@ -1,12 +1,9 @@
-from pathlib import Path
-
 from sql_cli.configuration import Config
+from sql_cli.project import BASE_SOURCE_DIR
 
 
 def test_from_yaml_to_config():
-    config_reference = Config(
-        project_dir=Path(__file__).parent.parent / "include/base", environment="default"
-    )
+    config_reference = Config(project_dir=BASE_SOURCE_DIR, environment="default")
     config_from_file = config_reference.from_yaml_to_config()
     assert isinstance(config_from_file, Config)
     assert config_from_file.project_dir == config_reference.project_dir
@@ -15,7 +12,7 @@ def test_from_yaml_to_config():
 
 
 def test_from_yaml_to_config_without_env():
-    config_reference = Config(project_dir=Path(__file__).parent.parent / "include/base")
+    config_reference = Config(project_dir=BASE_SOURCE_DIR)
     config_from_file = config_reference.from_yaml_to_config()
     assert isinstance(config_from_file, Config)
     assert config_from_file.project_dir == config_reference.project_dir