Merge remote-tracking branch 'upstream/development' into development

.github/workflows/ci.yaml

@@ -28,9 +28,13 @@ on:
   # rare scenario where the combination of merged PRs won't pass CI
   push:
     branches:
-    - master
     - '[0-9]+.[0-9]+.x'
 
+concurrency:
+  group:
+    ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     name: Lint code (Python ${{ matrix.python-version }})

.github/workflows/system-tests-enterprise.yml

@@ -363,7 +363,7 @@ jobs:
         # ensure mlrun git is safe to use
         git config --global --add safe.directory "$GITHUB_WORKSPACE"
         MLRUN_VERSION="${{ needs.prepare-system-tests-enterprise-ci.outputs.mlrunVersion }}" \
-          make install-requirements install-complete-requirements update-version-file
+          make install-requirements install-complete-kfp-requirements update-version-file
 
     - name: Run System Tests
       run: |

.github/workflows/system-tests-opensource.yml

@@ -161,7 +161,7 @@ jobs:
         "${GITHUB_WORKSPACE}/automation/scripts/github_workflow_free_space.sh"
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v4
+      uses: astral-sh/setup-uv@v5
       with:
         enable-cache: true
         cache-dependency-glob: "**/*requirements*.txt"

.github/workflows/upgrade-lock.yaml

@@ -31,7 +31,7 @@ jobs:
       run: |
         version=$(grep "MLRUN_UV_VERSION ?=" Makefile | cut -d' ' -f3)
         echo version=$version >> "$GITHUB_OUTPUT"
-    - uses: astral-sh/setup-uv@v4
+    - uses: astral-sh/setup-uv@v5
       with:
         version: ${{ steps.uv-version.outputs.version }}
     - name: Upgrade dependencies in the lock file with uv

Makefile

@@ -34,7 +34,7 @@ MLRUN_PYTHON_VERSION ?= 3.9
 MLRUN_SKIP_COMPILE_SCHEMAS ?=
 INCLUDE_PYTHON_VERSION_SUFFIX ?=
 MLRUN_PIP_VERSION ?= 24.2
-MLRUN_UV_VERSION ?= 0.5.8
+MLRUN_UV_VERSION ?= 0.5.13
 MLRUN_UV_IMAGE ?= ghcr.io/astral-sh/uv:$(MLRUN_UV_VERSION)
 MLRUN_CACHE_DATE ?= $(shell date +%s)
 # empty by default, can be set to something like "tag-name" which will cause to:
@@ -119,19 +119,22 @@ install-requirements: ## Install all requirements needed for development
 		-r requirements.txt \
 		-r extras-requirements.txt \
 		-r dev-requirements.txt \
-		-r dockerfiles/mlrun-api/requirements.txt \
-		-r docs/requirements.txt
+		-r dockerfiles/mlrun-api/requirements.txt
 
 .PHONY: install-conda-requirements
 install-conda-requirements: ## Install all requirements needed for development with specific conda packages for arm64
-	conda install --yes --file conda-arm64-requirements.txt
 	make install-requirements
 
 .PHONY: install-complete-requirements
 install-complete-requirements: ## Install all requirements needed for development and testing
 	$(MLRUN_PYTHON_VENV_PIP_INSTALL) --upgrade $(MLRUN_PIP_NO_CACHE_FLAG) pip~=$(MLRUN_PIP_VERSION)
 	$(MLRUN_PYTHON_VENV_PIP_INSTALL) .[complete]
 
+.PHONY: install-complete-kfp-requirements
+install-complete-kfp-requirements: ## Install all requirements needed for development and testing + KFP 1.8
+	$(MLRUN_PYTHON_VENV_PIP_INSTALL) --upgrade $(MLRUN_PIP_NO_CACHE_FLAG) pip~=$(MLRUN_PIP_VERSION)
+	$(MLRUN_PYTHON_VENV_PIP_INSTALL) .[complete,kfp18]
+
 .PHONY: install-all-requirements
 install-all-requirements: ## Install all requirements needed for development and testing
 	$(MLRUN_PYTHON_VENV_PIP_INSTALL) --upgrade $(MLRUN_PIP_NO_CACHE_FLAG) pip~=$(MLRUN_PIP_VERSION)
@@ -883,6 +886,7 @@ upgrade-mlrun-test-deps-lock: verify-uv-version ## Upgrade mlrun test locked req
 		requirements.txt \
 		extras-requirements.txt \
 		dockerfiles/mlrun-api/requirements.txt \
+		dockerfiles/mlrun-kfp/requirements.txt \
 		dev-requirements.txt \
 		docs/requirements.txt \
 		$(MLRUN_UV_UPGRADE_FLAG) \
@@ -893,6 +897,7 @@ upgrade-mlrun-system-test-deps-lock: verify-uv-version ## Upgrade mlrun system t
 	uv pip compile \
 		requirements.txt \
 		extras-requirements.txt \
+		dockerfiles/mlrun-kfp/requirements.txt \
 		dockerfiles/mlrun-api/requirements.txt \
 		dev-requirements.txt \
 		$(MLRUN_UV_UPGRADE_FLAG) \
@@ -902,6 +907,7 @@ upgrade-mlrun-system-test-deps-lock: verify-uv-version ## Upgrade mlrun system t
 upgrade-mlrun-kfp-deps-lock: verify-uv-version ## Upgrade mlrun-kfp locked requirements file
 	uv pip compile \
 		requirements.txt \
+		dockerfiles/mlrun-kfp/requirements.txt \
 		$(MLRUN_UV_UPGRADE_FLAG) \
 		--output-file dockerfiles/mlrun-kfp/locked-requirements.txt
 

automation/package_test/test.py

@@ -60,7 +60,7 @@ def __init__(self):
             "[google-cloud-bigquery]": {
                 "import_test_command": f"{basic_import}; {google_cloud_bigquery_import}"
             },
-            "[google-cloud-storage]": {
+            "[google-cloud]": {
                 "import_test_command": f"{basic_import}; {google_cloud_storage_import}"
             },
             "[redis]": {"import_test_command": f"{basic_import}; {redis_import}"},

automation/patch_igz/patch-api.yml

@@ -12,18 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-spec:
-  template:
-    spec:
-      containers:
-      - name: mlrun-api
-        imagePullPolicy: Always
-#        env:
-#        - name: MLRUN_MEMRAY
-#          value: "1"
-#        - name: MLRUN_MEMRAY_OUTPUT_FILE
-#          value: "/mlrun/db/api_memray.bin"
-#        - name: MLRUN_MEMRAY_EXTRA_FLAGS
-#          value: "--trace-python-allocators"
-      - name: mlrun-log-collector
-        imagePullPolicy: Always
+mlrun_alerts:
+  spec:
+    template:
+      spec:
+        containers:
+          - name: mlrun-api
+            imagePullPolicy: Always
+mlrun_api:
+  spec:
+    template:
+      spec:
+        containers:
+        - name: mlrun-api
+          imagePullPolicy: Always
+  #        env:
+  #        - name: MLRUN_MEMRAY
+  #          value: "1"
+  #        - name: MLRUN_MEMRAY_OUTPUT_FILE
+  #          value: "/mlrun/db/api_memray.bin"
+  #        - name: MLRUN_MEMRAY_EXTRA_FLAGS
+  #          value: "--trace-python-allocators"
+        - name: mlrun-log-collector
+          imagePullPolicy: Always