Implement --version in click

.changes/unreleased/Under the Hood-20230126-143102.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Implement --version for click cli
+time: 2023-01-26T14:31:02.740282-06:00
+custom:
+  Author: stu-k
+  Issue: "6757"

.github/workflows/main.yml

@@ -59,9 +59,7 @@ jobs:
           mypy --version
           python -m pip install -r requirements.txt
           python -m pip install -r dev-requirements.txt
-          # Running version disabled temporarily because version isn't implemented on this branch
-          # Please un-comment it when GH #6757 / CT-1926 is complete
-          #dbt --version
+          dbt --version
 
       - name: Run pre-commit hooks
         run: pre-commit run --all-files --show-diff-on-failure

core/dbt/cli/main.py

@@ -91,10 +91,6 @@ def cli(ctx, **kwargs):
     """An ELT tool for managing your SQL transformations and data models.
     For more documentation on these commands, visit: docs.getdbt.com
     """
-    # Version info
-    if ctx.params["version"]:
-        click.echo(f"`version` called\n ctx.params: {pf(ctx.params)}")
-        return
 
 
 # dbt build

core/dbt/cli/params.py

@@ -4,6 +4,7 @@
 from dbt.cli.options import MultiOption
 from dbt.cli.option_types import YAML, ChoiceTuple, WarnErrorOptionsType
 from dbt.cli.resolvers import default_project_dir, default_profiles_dir
+from dbt.version import get_version_information
 
 
 # TODO:  The name (reflected in flags) is a correction!
@@ -373,10 +374,20 @@
     default="{}",
 )
 
+
+def version_callback(ctx, param, value):
+    if not value or ctx.resilient_parsing:
+        return
+    click.echo(get_version_information())
+    ctx.exit()
+
+
 version = click.option(
     "--version",
+    callback=version_callback,
     envvar=None,
     help="Show version information",
+    is_eager=True,
     is_flag=True,
 )
 

core/dbt/docs/build/html/index.html

@@ -83,7 +83,7 @@ <h4>full_refresh<a class="headerlink" href="#build|full_refresh" title="Permalin
 </section>
 <section id="build|indirect_selection">
 <h4>indirect_selection<a class="headerlink" href="#build|indirect_selection" title="Permalink to this heading">¶</a></h4>
-<p>Type: choice: [‘eager’, ‘cautious’]</p>
+<p>Type: choice: [‘eager’, ‘cautious’, ‘buildable’]</p>
 <p>Select all tests that are adjacent to selected resources, even if they those resources have been explicitly selected.</p>
 </section>
 <section id="build|profile">
@@ -349,7 +349,7 @@ <h4>project_dir<a class="headerlink" href="#init|project_dir" title="Permalink t
 <section id="init|skip_profile_setup">
 <h4>skip_profile_setup<a class="headerlink" href="#init|skip_profile_setup" title="Permalink to this heading">¶</a></h4>
 <p>Type: boolean</p>
-<p>Skip interative profile setup.</p>
+<p>Skip interactive profile setup.</p>
 </section>
 <section id="init|target">
 <h4>target<a class="headerlink" href="#init|target" title="Permalink to this heading">¶</a></h4>
@@ -369,7 +369,7 @@ <h4>exclude<a class="headerlink" href="#list|exclude" title="Permalink to this h
 </section>
 <section id="list|indirect_selection">
 <h4>indirect_selection<a class="headerlink" href="#list|indirect_selection" title="Permalink to this heading">¶</a></h4>
-<p>Type: choice: [‘eager’, ‘cautious’]</p>
+<p>Type: choice: [‘eager’, ‘cautious’, ‘buildable’]</p>
 <p>Select all tests that are adjacent to selected resources, even if they those resources have been explicitly selected.</p>
 </section>
 <section id="list|models">
@@ -440,7 +440,7 @@ <h4>exclude<a class="headerlink" href="#list|exclude" title="Permalink to this h
 </section>
 <section id="list|indirect_selection">
 <h4>indirect_selection<a class="headerlink" href="#list|indirect_selection" title="Permalink to this heading">¶</a></h4>
-<p>Type: choice: [‘eager’, ‘cautious’]</p>
+<p>Type: choice: [‘eager’, ‘cautious’, ‘buildable’]</p>
 <p>Select all tests that are adjacent to selected resources, even if they those resources have been explicitly selected.</p>
 </section>
 <section id="list|models">
@@ -826,7 +826,7 @@ <h4>fail_fast<a class="headerlink" href="#test|fail_fast" title="Permalink to th
 </section>
 <section id="test|indirect_selection">
 <h4>indirect_selection<a class="headerlink" href="#test|indirect_selection" title="Permalink to this heading">¶</a></h4>
-<p>Type: choice: [‘eager’, ‘cautious’]</p>
+<p>Type: choice: [‘eager’, ‘cautious’, ‘buildable’]</p>
 <p>Select all tests that are adjacent to selected resources, even if they those resources have been explicitly selected.</p>
 </section>
 <section id="test|models">

tests/unit/test_dbt_runner.py

@@ -1,5 +1,7 @@
 import pytest
 
+import click.exceptions
+
 from dbt.cli.main import dbtRunner, dbtUsageException
 
 
@@ -21,4 +23,8 @@ def test_invalid_command(self, dbt: dbtRunner) -> None:
             dbt.invoke(["invalid-command"])
 
     def test_invoke_version(self, dbt: dbtRunner) -> None:
-        dbt.invoke(["--version"])
+        try:
+            dbt.invoke(["--version"])
+        # click exits early for version, this is intended
+        except click.exceptions.Exit:
+            return