Skip to content

Commit

Permalink
Further CI fixes for py312 support (#1992)
Browse files Browse the repository at this point in the history
* install git

* update version to 1.7.0.dev0

* add back dev deps required for test all runtimes

* upgrade to mlflow 2.19

* update poetry lock

* fix typo

* remove alibi libraries from constraints.txt

* run all tests for now

* use ubuntu 24.04 for tests

* run test_env sequentially

* move test to a seperate directory

* move to kafka-python-ng

* pin for now transformers

* use legacy keras in all runtimes test

* set envar in the main set_env

* remove constraints on torch / tf

* disable macos tests for now
  • Loading branch information
sakoush authored Dec 18, 2024
1 parent 7f6d69d commit d6241fc
Show file tree
Hide file tree
Showing 35 changed files with 580 additions and 699 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
target: ["dataplane", "model-repository"]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -37,7 +37,7 @@ jobs:
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -58,8 +58,8 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-22.04
- macos-13
- ubuntu-24.04
# - macos-13
# NOTE: There's no pre-built `grpcio` wheel for Python 3.11 yet
# https://github.com/grpc/grpc/issues/32454
python-version: ["3.9", "3.10", "3.11", "3.12"]
Expand Down Expand Up @@ -105,8 +105,8 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-22.04
- macos-13
- ubuntu-24.04
# - macos-13
python-version: ["3.9", "3.10", "3.11", "3.12"]
tox-environment:
- sklearn
Expand Down Expand Up @@ -158,8 +158,8 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-22.04
- macos-12
- ubuntu-24.04
# - macos-12
python-version: ["3.9", "3.10", "3.11", "3.12"]
runs-on: ${{ matrix.os }}
steps:
Expand Down
10 changes: 8 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ RUN pip install poetry==$POETRY_VERSION && \
--without-hashes \
--format constraints.txt \
-o /opt/mlserver/dist/constraints.txt && \
sed -i 's/\[.*\]//g' /opt/mlserver/dist/constraints.txt
sed -i 's/\[.*\]//g' /opt/mlserver/dist/constraints.txt && \
# skip constraints for alibi libraries as they are currently pointing to git and thus confusing constraints \
# remove when the alibi libraries versions are pointing to a released version
sed -i '/git+https:\/\/github.com\/SeldonIO/d' /opt/mlserver/dist/constraints.txt

FROM registry.access.redhat.com/ubi9/ubi-minimal
SHELL ["/bin/bash", "-c"]
Expand Down Expand Up @@ -53,7 +56,10 @@ RUN microdnf update -y && \
libgomp \
mesa-libGL \
glib2-devel \
shadow-utils
shadow-utils \
# git is used to pull alibi-detect and alibi-explain as we point now to master branches
# remove git requirements when alibi-detect and alibi-explain are released
git

# Install Conda, Python 3.10 and FFmpeg
RUN microdnf install -y wget && \
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = "Seldon Technologies"

# The full version, including alpha/beta/rc tags
release = "1.6.0.dev2"
release = "1.7.0.dev0"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion mlserver/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.6.0.dev2"
__version__ = "1.7.0.dev0"
Loading

0 comments on commit d6241fc

Please sign in to comment.