Merge branch 'main' into feature/paginated-generic-transfer

# Conflicts: # providers/common/sql/tests/provider_tests/common/sql/operators/test_generic_transfer.py # providers/standard/provider.yaml # providers/standard/src/airflow/providers/standard/operators/generic_transfer.py # providers/standard/tests/provider_tests/standard/operators/test_generic_transfer.py # providers/tests/standard/operators/test_generic_transfer.py # tests_common/test_utils/mock_context.py
apache · Jan 28, 2025 · 7aca76d · 7aca76d
2 parents fb240c8 + 1711856
commit 7aca76d
Show file tree

Hide file tree

Showing 2,336 changed files with 54,671 additions and 10,262 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -83,6 +83,7 @@ airflow/git_version
 # Exclude mode_modules pulled by "yarn" for compilation of www files generated by NPM
 airflow/www/node_modules
 airflow/ui/node_modules
+airflow/auth/managers/simple/ui/node_modules
 
 # Exclude link to docs
 airflow/www/static/docs

diff --git a/.github/actions/install-pre-commit/action.yml b/.github/actions/install-pre-commit/action.yml
@@ -24,10 +24,10 @@ inputs:
     default: "3.9"
   uv-version:
     description: 'uv version to use'
-    default: "0.5.20"  # Keep this comment to allow automatic replacement of uv version
+    default: "0.5.24"  # Keep this comment to allow automatic replacement of uv version
   pre-commit-version:
     description: 'pre-commit version to use'
-    default: "4.0.1"  # Keep this comment to allow automatic replacement of pre-commit version
+    default: "4.1.0"  # Keep this comment to allow automatic replacement of pre-commit version
   pre-commit-uv-version:
     description: 'pre-commit-uv version to use'
     default: "4.1.4"  # Keep this comment to allow automatic replacement of pre-commit-uv version