Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync v2-5-stable with v2-5-test to release 2.5.1 #28997

Merged
merged 4 commits into from
Jan 18, 2023
Merged

Sync v2-5-stable with v2-5-test to release 2.5.1 #28997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0be7ab4
Fix task id when making the mapped task label in graph view (#28993)
bbovenzi Jan 17, 2023
9d97c5f
Limit dnspython to < 2.3.0 until eventlet incompatibitliy is solved (…
potiuk Jan 15, 2023
a0b464f
Remove limit for dnspython after eventlet got fixed (#29004)
potiuk Jan 18, 2023
49867b6
Update changelog to add #28962
pierrejeambrun Jan 17, 2023
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
4 changes: 3 additions & 1 deletion RELEASE_NOTES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

.. towncrier release notes start

Airflow 2.5.1 (2023-01-16)
Airflow 2.5.1 (2023-01-20)
--------------------------

Significant Changes
Expand Down Expand Up @@ -93,6 +93,8 @@ Bug Fixes

Misc/Internal
^^^^^^^^^^^^^
- Remove limit for ``dnspython`` after eventlet got fixed (#29004)
- Limit ``dnspython`` to < ``2.3.0`` until eventlet incompatibility is solved (#28962)
- Add automated version replacement in example dag indexes (#28090)
- Cleanup and do housekeeping with plugin examples (#28537)
- Limit ``SQLAlchemy`` to below ``2.0`` (#28725)
Expand Down
6 changes: 3 additions & 3 deletions airflow/www/static/js/graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ const updateNodeLabels = (node, instances) => {
let { label } = node.value;
// Check if there is a count of mapped instances
if ((tasks[node.id] && tasks[node.id].is_mapped) || node.value.isMapped) {
const firstChildId = node.children[0].id;
const id = !!node.children && node.children.length ? node.children[0].id : node.value.id;

let count = ' ';

// get count from mapped_states or the first child's mapped_states
// TODO: update this count for when we can nest mapped tasks inside of mapped task groups
if (instances[node.id] && instances[node.id].mapped_states) {
count = instances[node.id].mapped_states.length;
} else if (firstChildId && instances[firstChildId]) {
count = instances[firstChildId].mapped_states.length;
} else if (id && instances[id]) {
count = instances[id].mapped_states.length;
}

if (!label.includes(`[${count}]`)) {
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def write_version(filename: str = str(AIRFLOW_SOURCES_ROOT / "airflow" / "git_ve
# If you change this mark you should also change ./scripts/ci/check_order_setup.py
# Start dependencies group
async_packages = [
"eventlet>=0.9.7",
"eventlet>=0.33.3",
"gevent>=0.13",
"greenlet>=0.4.9",
]
Expand Down