Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
)
from airflow.models.baseoperator import BaseOperator
from airflow.models.variable import Variable
from airflow.operators.branch import BranchMixIn
from airflow.providers.standard.utils.python_virtualenv import prepare_virtualenv, write_python_script
from airflow.providers.standard.version_compat import AIRFLOW_V_2_10_PLUS, AIRFLOW_V_3_0_PLUS
from airflow.utils import hashlib_wrapper
Expand All @@ -53,9 +52,11 @@
from airflow.utils.process_utils import execute_in_subprocess, execute_in_subprocess_with_kwargs

if AIRFLOW_V_3_0_PLUS:
from airflow.providers.standard.operators.branch import BranchMixIn
from airflow.providers.standard.utils.skipmixin import SkipMixin
else:
from airflow.models.skipmixin import SkipMixin
from airflow.operators.branch import BranchMixIn


log = logging.getLogger(__name__)
Expand Down