Merge pull request #47 from getindata/release-0.10.0

Release 0.10.0

Author: swtwsk

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [0.10.0] - 2022-01-12
+
+### Changed
+
+-   Run `dbt deps` at the end of `dp prepare-env`.
+
+### Fixed
+
+-   `dp run` and `dp test` are no longer pointing to `profiles.yml` instead of the directory containing it.
+
 ## [0.9.0] - 2022-01-03
 
 ### Added
@@ -121,7 +131,9 @@
 -   Draft of `dp init`, `dp create`, `dp template new`, `dp template list` and `dp dbt`
 -   Draft of `dp compile` and `dp deploy`
 
-[Unreleased]: https://github.com/getindata/data-pipelines-cli/compare/0.9.0...HEAD
+[Unreleased]: https://github.com/getindata/data-pipelines-cli/compare/0.10.0...HEAD
+
+[0.10.0]: https://github.com/getindata/data-pipelines-cli/compare/0.9.0...0.10.0
 
 [0.9.0]: https://github.com/getindata/data-pipelines-cli/compare/0.8.0...0.9.0
 

data_pipelines_cli/__init__.py

@@ -1 +1 @@
-version = "0.9.0"
+version = "0.10.0"

data_pipelines_cli/cli_commands/prepare_env.py

@@ -9,7 +9,7 @@
 
 from data_pipelines_cli.cli_utils import echo_subinfo
 from data_pipelines_cli.config_generation import DbtProfile, generate_profiles_dict
-from data_pipelines_cli.dbt_utils import read_dbt_vars_from_configs
+from data_pipelines_cli.dbt_utils import read_dbt_vars_from_configs, run_dbt_command
 from data_pipelines_cli.errors import JinjaVarKeyError
 
 
@@ -84,7 +84,8 @@ def prepare_env(env: str) -> None:
     with open(home_profiles_path, "w") as profiles:
         yaml.dump(profile, profiles, default_flow_style=False)
 
-    echo_subinfo(f"Saved profiles.yml in {home_profiles_path}")
+    echo_subinfo(f"Saved profiles.yml in {home_profiles_path.parent}")
+    run_dbt_command(("deps",), env, home_profiles_path.parent)
 
 
 @click.command(

data_pipelines_cli/cli_commands/run.py

@@ -1,6 +1,6 @@
 import click
 
-from ..config_generation import get_profiles_yml_build_path
+from ..config_generation import get_profiles_dir_build_path
 from ..dbt_utils import run_dbt_command
 from .compile import compile_project
 
@@ -13,7 +13,7 @@ def run(env: str) -> None:
     :type env: str
     """
     compile_project(env)
-    profiles_path = get_profiles_yml_build_path(env)
+    profiles_path = get_profiles_dir_build_path(env)
     run_dbt_command(("run",), env, profiles_path)
 
 

data_pipelines_cli/cli_commands/test.py

@@ -1,6 +1,6 @@
 import click
 
-from ..config_generation import get_profiles_yml_build_path
+from ..config_generation import get_profiles_dir_build_path
 from ..dbt_utils import run_dbt_command
 from .compile import compile_project
 
@@ -13,7 +13,7 @@ def test(env: str) -> None:
     :type env: str
     """
     compile_project(env)
-    profiles_path = get_profiles_yml_build_path(env)
+    profiles_path = get_profiles_dir_build_path(env)
     run_dbt_command(("test",), env, profiles_path)
 
 

data_pipelines_cli/config_generation.py

@@ -136,18 +136,17 @@ def generate_profiles_dict(env: str, copy_config_dir: bool) -> Dict[str, DbtProf
     }
 
 
-def get_profiles_yml_build_path(env: str) -> pathlib.Path:
+def get_profiles_dir_build_path(env: str) -> pathlib.Path:
     """
-    Returns path to ``build/profiles/<profile_name>/profiles.yml``,
-    depending on `env` argument.
+    Returns path to ``build/profiles/<profile_name>/``, depending on `env` argument.
 
     :param env: Name of the environment
     :type env: str
     :return:
     :rtype: pathlib.Path
     """
     profile_name = get_dbt_profiles_env_name(env)
-    return BUILD_DIR.joinpath("profiles", profile_name, "profiles.yml")
+    return BUILD_DIR.joinpath("profiles", profile_name)
 
 
 def generate_profiles_yml(env: str, copy_config_dir: bool = True) -> pathlib.Path:
@@ -166,10 +165,10 @@ def generate_profiles_yml(env: str, copy_config_dir: bool = True) -> pathlib.Pat
     echo_info("Generating profiles.yml")
     profile = generate_profiles_dict(env, copy_config_dir)
 
-    profiles_path = get_profiles_yml_build_path(env)
-    profiles_path.parent.mkdir(parents=True, exist_ok=True)
-    with open(profiles_path, "w") as profiles:
+    profiles_path = get_profiles_dir_build_path(env)
+    profiles_path.mkdir(parents=True, exist_ok=True)
+    with open(profiles_path.joinpath("profiles.yml"), "w") as profiles:
         yaml.dump(profile, profiles, default_flow_style=False)
     echo_subinfo(f"Generated profiles.yml in {profiles_path}")
 
-    return profiles_path.parent
+    return profiles_path

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.0
+current_version = 0.10.0
 
 [bumpversion:file:setup.py]
 

setup.py

@@ -50,7 +50,7 @@
 
 setup(
     name="data_pipelines_cli",
-    version="0.9.0",
+    version="0.10.0",
     description="CLI for data platform",
     long_description=README,
     long_description_content_type="text/markdown",

tests/cli_commands/test_prepare_env.py

@@ -51,6 +51,8 @@ def test_no_var_profiles_generation(self):
             "pathlib.Path.cwd", lambda: self.goldens_dir_path
         ), tempfile.TemporaryDirectory() as tmp_dir2, patch(
             "pathlib.Path.home", lambda: pathlib.Path(tmp_dir2)
+        ), patch(
+            "data_pipelines_cli.dbt_utils.subprocess_run", lambda _args: None
         ):
             runner.invoke(_cli, ["prepare-env"])
             with open(
@@ -80,6 +82,8 @@ def test_vars_profiles_generation(self):
             "pathlib.Path.cwd", lambda: self.goldens_dir_path
         ), tempfile.TemporaryDirectory() as tmp_dir2, patch(
             "pathlib.Path.home", lambda: pathlib.Path(tmp_dir2)
+        ), patch(
+            "data_pipelines_cli.dbt_utils.subprocess_run", lambda _args: None
         ):
             prepare_env("staging")
 
@@ -105,6 +109,8 @@ def test_raise_missing_variable(self):
             "pathlib.Path.cwd", lambda: self.goldens_dir_path
         ), tempfile.TemporaryDirectory() as tmp_dir2, patch(
             "pathlib.Path.home", lambda: pathlib.Path(tmp_dir2)
+        ), patch(
+            "data_pipelines_cli.dbt_utils.subprocess_run", lambda _args: None
         ):
             with self.assertRaises(JinjaVarKeyError):
                 prepare_env("staging")
@@ -124,6 +130,8 @@ def test_raise_missing_environment_variable(self):
             "pathlib.Path.cwd", lambda: self.goldens_dir_path
         ), tempfile.TemporaryDirectory() as tmp_dir2, patch(
             "pathlib.Path.home", lambda: pathlib.Path(tmp_dir2)
+        ), patch(
+            "data_pipelines_cli.dbt_utils.subprocess_run", lambda _args: None
         ):
             with self.assertRaises(JinjaVarKeyError):
                 prepare_env("staging")