Merge pull request #1620 from SeldonIO/master

Pull latest changes from master to release 1.5 branch
SeldonIO · Mar 4, 2024 · 63ab929 · 63ab929
2 parents daea910 + d977788
commit 63ab929
Show file tree

Hide file tree

Showing 8 changed files with 234 additions and 84 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,7 +33,8 @@ jobs:
           generate_release_notes: true
           draft: true
           tag_name: ${{ github.event.inputs.version }}
-  mlserver:
+
+  mlserver-image-build:
     needs: draft-release
     runs-on: ubuntu-latest
     steps:
@@ -50,26 +51,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.version }}
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: false
-      - name: Build Python wheel
-        run: |
-          poetry build
-          poetry publish --skip-existing
-        env:
-          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.TWINE_USERNAME }}
-          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
       - name: Build Docker Image
         run: |
-          DOCKER_BUILDKIT=1 docker build . \
-            --build-arg RUNTIMES="" \
-            -t $MLSERVER_IMAGE-slim
           DOCKER_BUILDKIT=1 docker build . \
             --build-arg RUNTIMES=all \
             -t $MLSERVER_IMAGE
@@ -84,7 +67,68 @@ jobs:
             --severity-threshold=high
             --file=Dockerfile
             --policy-path=.snyk
-      - name: Scan Docker Slim Image
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Push to DockerHub
+        run: |
+          docker push $MLSERVER_IMAGE
+      - name: Login to Quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: Push to Quay.io
+        run: |
+          docker tag $MLSERVER_IMAGE $QUAY_MLSERVER_IMAGE
+          docker push $QUAY_MLSERVER_IMAGE
+      - name: Install preflight
+        run: |
+          wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/$PREFLIGHT_VERSION/preflight-linux-amd64
+          chmod u+x preflight-linux-amd64
+          sudo mv preflight-linux-amd64 /usr/local/bin/preflight
+          preflight --version
+        env:
+          PREFLIGHT_VERSION: 1.4.2
+      - name: Submit preflight results
+        run: |
+          preflight check container \
+            $QUAY_MLSERVER_IMAGE \
+            --docker-config=${HOME}/.docker/config.json \
+            --certification-project-id=$PROJECT_ID \
+            --pyxis-api-token=$PYXIS_API_TOKEN \
+            --artifacts ./artifacts/mlserver-slim \
+            --submit
+        env:
+          PYXIS_API_TOKEN: ${{ secrets.PYXIS_API_TOKEN }}
+          PROJECT_ID: 63566bb9822ce8cef9ba27fc
+
+  mlserver-slim-image-build:
+    needs: draft-release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@master
+        with:
+          remove-dotnet: 'true'
+          remove-haskell: 'true'
+          remove-android: 'true'
+          remove-codeql: 'true'
+          remove-docker-images: 'true'
+          root-reserve-mb: 30720
+          swap-size-mb: 1024
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.version }}
+      - name: Build Docker Image
+        run: |
+          DOCKER_BUILDKIT=1 docker build . \
+            --build-arg RUNTIMES="" \
+            -t $MLSERVER_IMAGE-slim
+      - name: Scan Docker Image
         uses: snyk/actions/docker@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
@@ -103,7 +147,6 @@ jobs:
       - name: Push to DockerHub
         run: |
           docker push $MLSERVER_IMAGE-slim
-          docker push $MLSERVER_IMAGE
       - name: Login to Quay.io
         uses: docker/login-action@v3
         with:
@@ -114,8 +157,6 @@ jobs:
         run: |
           docker tag $MLSERVER_IMAGE-slim $QUAY_MLSERVER_IMAGE-slim
           docker push $QUAY_MLSERVER_IMAGE-slim
-          docker tag $MLSERVER_IMAGE $QUAY_MLSERVER_IMAGE
-          docker push $QUAY_MLSERVER_IMAGE
       - name: Install preflight
         run: |
           wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/$PREFLIGHT_VERSION/preflight-linux-amd64
@@ -133,17 +174,33 @@ jobs:
             --pyxis-api-token=$PYXIS_API_TOKEN \
             --artifacts ./artifacts/mlserver \
             --submit
-          preflight check container \
-            $QUAY_MLSERVER_IMAGE \
-            --docker-config=${HOME}/.docker/config.json \
-            --certification-project-id=$PROJECT_ID \
-            --pyxis-api-token=$PYXIS_API_TOKEN \
-            --artifacts ./artifacts/mlserver-slim \
-            --submit
         env:
           PYXIS_API_TOKEN: ${{ secrets.PYXIS_API_TOKEN }}
           PROJECT_ID: 63566bb9822ce8cef9ba27fc
-
+
+  pypy-publish:
+    needs: draft-release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.version }}
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: false
+      - name: Build Python wheel
+        run: |
+          poetry build
+          poetry publish --skip-existing
+        env:
+          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.TWINE_USERNAME }}
+          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+
   runtimes:
     needs: draft-release
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -75,13 +75,32 @@ Out of the box, MLServer provides support for:
 | XGBoost       | ✅        | [MLServer XGBoost](./runtimes/xgboost)                           |
 | Spark MLlib   | ✅        | [MLServer MLlib](./runtimes/mllib)                               |
 | LightGBM      | ✅        | [MLServer LightGBM](./runtimes/lightgbm)                         |
-| CatBoost     | ✅        | [MLServer CatBoost](./runtimes/catboost)                         |
+| CatBoost      | ✅        | [MLServer CatBoost](./runtimes/catboost)                         |
 | Tempo         | ✅        | [`github.com/SeldonIO/tempo`](https://github.com/SeldonIO/tempo) |
 | MLflow        | ✅        | [MLServer MLflow](./runtimes/mlflow)                             |
 | Alibi-Detect  | ✅        | [MLServer Alibi Detect](./runtimes/alibi-detect)                 |
 | Alibi-Explain | ✅        | [MLServer Alibi Explain](./runtimes/alibi-explain)               |
 | HuggingFace   | ✅        | [MLServer HuggingFace](./runtimes/huggingface)                   |
 
+## Supported Python Versions
+
+🔴 Unsupported
+
+🟠 Deprecated: To be removed in a future version
+
+🟢 Supported
+
+🔵 Untested
+
+| Python Version | Status |
+| -------------- | ------ |
+| 3.7            | 🔴     |
+| 3.8            | 🔴     |
+| 3.9            | 🟢     |
+| 3.10           | 🟢     |
+| 3.11           | 🔵     |
+| 3.12           | 🔵     |
+
 ## Examples
 
 To see MLServer in action, check out [our full list of

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -79,7 +79,7 @@ datamodel-code-generator = "0.25.4"
 grpcio-tools = "1.48.1"
 pytest = "7.4.4"
 pytest-asyncio = "0.21.1"
-pytest-mock = "3.11.1"
+pytest-mock = "3.12.0"
 pytest-cases = "3.8.2"
 tox = "4.6.3"
 docker = "7.0.0"