This is an automated email from the ASF dual-hosted git repository.
Miretpl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new e98b9b3664d chore: rebase onto main to retrigger CI (#70538)
e98b9b3664d is described below
commit e98b9b3664daf0cf9208573e2b508c3645f03620
Author: Dr Alex Mitre <[email protected]>
AuthorDate: Tue Aug 4 16:05:35 2026 -0600
chore: rebase onto main to retrigger CI (#70538)
No logic change. Rebased PR #70538.
Co-authored-by: mitre88 <[email protected]>
---
generated/known_airflow_exceptions.txt | 1 -
providers/git/src/airflow/providers/git/hooks/git.py | 4 ++--
providers/git/tests/unit/git/hooks/test_git.py | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/generated/known_airflow_exceptions.txt
b/generated/known_airflow_exceptions.txt
index e170208c367..2c82d85dfc6 100644
--- a/generated/known_airflow_exceptions.txt
+++ b/generated/known_airflow_exceptions.txt
@@ -200,7 +200,6 @@
providers/fab/src/airflow/providers/fab/auth_manager/models/db.py::1
providers/fab/src/airflow/providers/fab/www/extensions/init_security.py::1
providers/facebook/src/airflow/providers/facebook/ads/hooks/ads.py::2
providers/git/src/airflow/providers/git/bundles/git.py::5
-providers/git/src/airflow/providers/git/hooks/git.py::1
providers/git/tests/unit/git/bundles/test_git.py::1
providers/github/src/airflow/providers/github/operators/github.py::2
providers/github/src/airflow/providers/github/sensors/github.py::3
diff --git a/providers/git/src/airflow/providers/git/hooks/git.py
b/providers/git/src/airflow/providers/git/hooks/git.py
index 4ec8738758b..0eafece941a 100644
--- a/providers/git/src/airflow/providers/git/hooks/git.py
+++ b/providers/git/src/airflow/providers/git/hooks/git.py
@@ -30,7 +30,7 @@ from typing import Any
from urllib.parse import quote as urlquote
from airflow.exceptions import AirflowProviderDeprecationWarning
-from airflow.providers.common.compat.sdk import AirflowException, BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
log = logging.getLogger(__name__)
@@ -113,7 +113,7 @@ class GitHook(BaseHook):
self.env: dict[str, str] = {}
if self.key_file and self.private_key:
- raise AirflowException("Both 'key_file' and 'private_key' cannot
be provided at the same time")
+ raise ValueError("Both 'key_file' and 'private_key' cannot be
provided at the same time")
if host_key_checking_defaulted and self._uses_ssh_transport_options():
warnings.warn(
diff --git a/providers/git/tests/unit/git/hooks/test_git.py
b/providers/git/tests/unit/git/hooks/test_git.py
index 1d750ca99c3..484791fe19c 100644
--- a/providers/git/tests/unit/git/hooks/test_git.py
+++ b/providers/git/tests/unit/git/hooks/test_git.py
@@ -26,7 +26,6 @@ from git import Repo
from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.models import Connection
-from airflow.providers.common.compat.sdk import AirflowException
from airflow.providers.git.hooks.git import GitHook
from tests_common.test_utils.config import conf_vars
@@ -204,7 +203,7 @@ class TestGitHook:
)
with pytest.raises(
- AirflowException, match="Both 'key_file' and 'private_key' cannot
be provided at the same time"
+ ValueError, match="Both 'key_file' and 'private_key' cannot be
provided at the same time"
):
GitHook(git_conn_id=CONN_BOTH_PATH_INLINE)
