Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
@pierrejeambrun @ephraimbuddy
pierrejeambrun authored and ephraimbuddy committed Mar 10, 2023
1 parent 89b3f24 commit 321d602
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ repos:
files: >
\.cfg$|\.conf$|\.ini$|\.ldif$|\.properties$|\.readthedocs$|\.service$|\.tf$|Dockerfile.*$
- repo: https://github.com/PyCQA/isort
rev: 5.11.2
rev: 5.11.5
hooks:
- id: isort
name: Run isort to sort imports in Python files
Expand Down
4 changes: 2 additions & 2 deletions airflow/utils/timezone.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ def td_format(td_object: None | dt.timedelta | float | int) -> str | None:
delta = relativedelta(seconds=int(td_object))
# relativedelta for timedelta cannot convert days to months
# so calculate months by assuming 30 day months and normalize
months, delta.days = divmod(delta.days, 30)
delta = delta.normalized() + relativedelta(months=months)
months, delta.days = divmod(delta.days, 30) # type: ignore[attr-defined]
delta = delta.normalized() + relativedelta(months=months) # type: ignore[attr-defined]

def _format_part(key: str) -> str:
value = int(getattr(delta, key))
Expand Down
1 change: 1 addition & 0 deletions docs/spelling_wordlist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ conn
connectTimeoutMS
connexion
containerConfiguration
containerd
ContainerGroup
containerinstance
ContainerPort
Expand Down
123 changes: 41 additions & 82 deletions tests/models/test_dag.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ def test_get_num_task_instances(self):
session.close()

def test_get_task_instances_before(self):

BASE_DATE = timezone.datetime(2022, 7, 20, 20)

test_dag_id = "test_get_task_instances_before"
Expand Down Expand Up @@ -503,90 +502,53 @@ def dag_run_before(delta_h=0, type=DagRunType.SCHEDULED):

REF_DATE = BASE_DATE

assert set([dr.run_id for dr in [dr1]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=1, session=session)
]
)
assert set([dr.run_id for dr in [dr1, dr2, dr3]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=3, session=session)
]
)
assert set([dr.run_id for dr in [dr1, dr2, dr3, dr4, dr5]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=5, session=session)
]
)
assert set([dr.run_id for dr in [dr1, dr2, dr3, dr4, dr5, dr6, dr7]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=7, session=session)
]
)
assert set([dr.run_id for dr in [dr1, dr2, dr3, dr4, dr5, dr6, dr7, dr8]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=9, session=session)
]
)
assert set([dr.run_id for dr in [dr1, dr2, dr3, dr4, dr5, dr6, dr7, dr8]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=10, session=session)
]
) # stays constrained to available ones
assert {dr.run_id for dr in [dr1]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=1, session=session)
}
assert {dr.run_id for dr in [dr1, dr2, dr3]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=3, session=session)
}
assert {dr.run_id for dr in [dr1, dr2, dr3, dr4, dr5]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=5, session=session)
}
assert {dr.run_id for dr in [dr1, dr2, dr3, dr4, dr5, dr6, dr7]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=7, session=session)
}
assert {dr.run_id for dr in [dr1, dr2, dr3, dr4, dr5, dr6, dr7, dr8]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=9, session=session)
}
assert {dr.run_id for dr in [dr1, dr2, dr3, dr4, dr5, dr6, dr7, dr8]} == {
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=10, session=session)
} # stays constrained to available ones

REF_DATE = BASE_DATE + timedelta(hours=-3.5)

assert set([dr.run_id for dr in [dr4]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=1, session=session)
]
)
assert set([dr.run_id for dr in [dr4, dr5, dr6]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=3, session=session)
]
)
assert set([dr.run_id for dr in [dr4, dr5, dr6, dr7, dr8]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=5, session=session)
]
)
assert set([dr.run_id for dr in [dr4, dr5, dr6, dr7, dr8]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=6, session=session)
]
) # stays constrained to available ones
assert {dr.run_id for dr in [dr4]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=1, session=session)
}
assert {dr.run_id for dr in [dr4, dr5, dr6]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=3, session=session)
}
assert {dr.run_id for dr in [dr4, dr5, dr6, dr7, dr8]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=5, session=session)
}
assert {dr.run_id for dr in [dr4, dr5, dr6, dr7, dr8]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=6, session=session)
} # stays constrained to available ones

REF_DATE = BASE_DATE + timedelta(hours=-8)

assert set([dr.run_id for dr in [dr8]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=0, session=session)
]
)
assert set([dr.run_id for dr in [dr8]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=1, session=session)
]
)
assert set([dr.run_id for dr in [dr8]]) == set(
[
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=10, session=session)
]
)
assert {dr.run_id for dr in [dr8]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=0, session=session)
}
assert {dr.run_id for dr in [dr8]} == {
ti.run_id for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=1, session=session)
}
assert {dr.run_id for dr in [dr8]} == {
ti.run_id
for ti in test_dag.get_task_instances_before(base_date=REF_DATE, num=10, session=session)
}

session.close()

Expand Down Expand Up @@ -634,7 +596,6 @@ def test_template_env(self, use_native_obj, force_sandboxed, expected_env):
assert isinstance(jinja_env, expected_env)

def test_resolve_template_files_value(self):

with NamedTemporaryFile(suffix=".template") as f:
f.write(b"{{ ds }}")
f.flush()
Expand All @@ -652,7 +613,6 @@ def test_resolve_template_files_value(self):
assert task.test_field == "{{ ds }}"

def test_resolve_template_files_list(self):

with NamedTemporaryFile(suffix=".template") as f:
f.write(b"{{ ds }}")
f.flush()
Expand Down Expand Up @@ -1265,7 +1225,6 @@ def test_new_dag_is_paused_upon_creation(self):
session.close()

def test_existing_dag_default_view(self):

with create_session() as session:
session.add(DagModel(dag_id="dag_default_view_old", default_view=None))
session.commit()
Expand Down

0 comments on commit 321d602

Please sign in to comment.