tinybird-cli 5.5.1.dev1__tar.gz → 5.5.1.dev3__tar.gz

{tinybird-cli-5.5.1.dev1 → tinybird-cli-5.5.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.5.1.dev1
+Version: 5.5.1.dev3
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.5.1.dev3
+**********
+
+- `Changed` Internal change
+
+5.5.1.dev2
+**********
+
+- `Changed` Internal change
+
 5.5.0
 **********
 

{tinybird-cli-5.5.1.dev1 → tinybird-cli-5.5.1.dev3}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '5.5.1.dev1'
-__revision__ = 'e2def8c'
+__version__ = '5.5.1.dev3'
+__revision__ = '13e87e0'

{tinybird-cli-5.5.1.dev1 → tinybird-cli-5.5.1.dev3}/tinybird/datafile.py

@@ -439,9 +439,16 @@ class CLIGitRelease:
             raise CLIGitReleaseException(
                 FeedbackManager.error_commit_changes_to_release(path=self.path, git_output=self.status())
             )
-        elif not self.is_head_outdated(current_release["commit"]) and check_outdated:
-            raise CLIGitReleaseException(FeedbackManager.error_head_outdated(commit=self.head_commit()))
-        elif not self.is_new_release(current_release["commit"]) and check_new:
+        try:
+            if not self.is_head_outdated(current_release["commit"]):
+                if check_outdated:
+                    raise CLIGitReleaseException(FeedbackManager.error_head_outdated(commit=self.head_commit()))
+                else:
+                    click.echo(FeedbackManager.warning_head_outdated(commit=self.head_commit()))
+        except CLIGitReleaseException as e:
+            if check_outdated:
+                raise e
+        if not self.is_new_release(current_release["commit"]) and check_new:
             raise CLIGitReleaseException(FeedbackManager.error_head_already_released(commit=current_release["commit"]))
 
     def get_changes_from_diffs(self, diffs: List[Diff], filenames: List[str]):
@@ -557,13 +564,14 @@ class Deployment:
         only_changes: bool = False,
         config: Optional[Dict[str, Any]] = None,
         use_main: bool = False,
+        check_outdated: bool = True,
     ):
         if self.is_git_release:
             if not self.current_release:
                 raise CLIGitReleaseException(FeedbackManager.error_init_release(workspace=self.current_ws["name"]))
             self.cli_git_release = CLIGitRelease()
             if not use_main:
-                self.cli_git_release.validate_local_for_release(self.current_release)
+                self.cli_git_release.validate_local_for_release(self.current_release, check_outdated=check_outdated)
             click.echo(FeedbackManager.info_deployment_detecting_changes_header())
             commit = self.cli_git_release.get_main_branch_commit() if use_main else self.current_release["commit"]
             diffs = self.cli_git_release.diff_datafiles(commit)
@@ -3981,6 +3989,7 @@ async def folder_push(
     auto_promote: Optional[bool] = False,
     check_backfill_required: bool = False,
     use_main: bool = False,
+    check_outdated: bool = True,
 ):  # noqa: C901
     workspaces: List[Dict[str, Any]] = (await tb_client.user_workspaces_and_branches()).get("workspaces", [])
     current_ws: Dict[str, Any] = next(
@@ -4023,7 +4032,9 @@ async def folder_push(
         filenames = get_project_filenames(folder)
 
     # get the list of changes
-    changed, deleted = await deployment.detect_changes(filenames, only_changes, config, use_main)
+    changed, deleted = await deployment.detect_changes(
+        filenames, only_changes, config, use_main, check_outdated=check_outdated
+    )
 
     deployment.check_changes(changed, pipes, release_created)
 

{tinybird-cli-5.5.1.dev1 → tinybird-cli-5.5.1.dev3}/tinybird/feedback_manager.py

@@ -317,6 +317,9 @@ class FeedbackManager:
     error_head_outdated = error_message(
         "Current HEAD commit '{commit}' is outdated.\n\n    💡Hint: consider to rebase your Git branch with base branch."
     )
+    warning_head_outdated = warning_message(
+        "Current HEAD commit '{commit}' is outdated.\n\n    💡Hint: consider to rebase your Git branch with base branch."
+    )
     error_head_already_released = error_message("Current HEAD commit '{commit}' is already deployed")
     error_in_git_ancestor_commits = error_message(
         "Error checking relationship between HEAD '{head_commit}' and Workspace commit '{workspace_commit}'.\n\n    Current Workspace commit needs to be an ancestor of the commit being deployed.\n\n    💡 Hint: consider to rebase your Git branch. If the problem persists, double check the Workspace commit exists in the git log, if it does not exist you can override the Workspace commit to an ancestor of the commit being deployed using `tb init --override-commit <commit>`"

{tinybird-cli-5.5.1.dev1 → tinybird-cli-5.5.1.dev3}/tinybird/tb_cli_modules/cli.py

@@ -1429,6 +1429,13 @@ async def prompt(_ctx: Context) -> None:
     help="Use main commit instead of release commit",
     hidden=True,
 )
+@click.option(
+    "--skip-head-outdated",
+    is_flag=True,
+    default=False,
+    help="Allows to deploy any commit without checking if the branch is rebased to the workspace commit",
+    hidden=True,
+)
 @click.pass_context
 @coro
 async def deploy(
@@ -1449,6 +1456,7 @@ async def deploy(
     fork_downstream: bool,
     fork: bool,
     use_main: bool,
+    skip_head_outdated: bool,
 ) -> None:
     """Deploy in Tinybird pushing resources changed from last git commit deployed.
 
@@ -1591,6 +1599,7 @@ async def deploy(
                 auto_promote=auto_promote,
                 check_backfill_required=check_backfill_required,
                 use_main=use_main,
+                check_outdated=not skip_head_outdated,
             )
         except Exception as e:
             if release_created and not dry_run:

{tinybird-cli-5.5.1.dev1 → tinybird-cli-5.5.1.dev3}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.5.1.dev1
+Version: 5.5.1.dev3
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.5.1.dev3
+**********
+
+- `Changed` Internal change
+
+5.5.1.dev2
+**********
+
+- `Changed` Internal change
+
 5.5.0
 **********