Skip to content

Commit

Permalink
Fix syntax error
Browse files Browse the repository at this point in the history
  • Loading branch information
RobertSamoilescu committed Jun 18, 2024
1 parent a2cc30a commit 4d5a18d
Show file tree
Hide file tree
Showing 2 changed files with 153 additions and 153 deletions.
304 changes: 152 additions & 152 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,51 @@ on:
branches: [master]

jobs:
generate:
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.10"]
target: ["dataplane", "model-repository"]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: false
- name: Install dependencies
run: poetry install --sync --only dev
- name: Generate ${{ matrix.target }}
run: make generate-${{ matrix.target }}
- name: Check for changes
run: make lint-no-changes
# generate:
# strategy:
# fail-fast: false
# matrix:
# python-version: ["3.9", "3.10"]
# target: ["dataplane", "model-repository"]
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v4
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v5
# with:
# python-version: ${{ matrix.python-version }}
# - name: Install Poetry
# uses: snok/install-poetry@v1
# with:
# virtualenvs-create: false
# - name: Install dependencies
# run: poetry install --sync --only dev
# - name: Generate ${{ matrix.target }}
# run: make generate-${{ matrix.target }}
# - name: Check for changes
# run: make lint-no-changes

lint:
strategy:
matrix:
python-version:
- "3.9"
- "3.10"
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: false
- name: Install dependencies
run: poetry install --sync --only dev
- name: Lint
run: make lint
# lint:
# strategy:
# matrix:
# python-version:
# - "3.9"
# - "3.10"
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v4
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v5
# with:
# python-version: ${{ matrix.python-version }}
# - name: Install Poetry
# uses: snok/install-poetry@v1
# with:
# virtualenvs-create: false
# - name: Install dependencies
# run: poetry install --sync --only dev
# - name: Lint
# run: make lint

test-mlserver:
strategy:
Expand All @@ -65,7 +65,7 @@ jobs:
# 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.9"
- "3.10"
is-pr:
- ${{ github.event_name == 'pull_request' }}
Expand Down Expand Up @@ -99,119 +99,119 @@ jobs:
run: poetry install --only test
- name: Test
run: |
if [[ ${{ runner.os == 'macOS' }} ]]; then
if [[ "$(uname)" == 'Darwin' ]]; then
source ./hack/activate-libomp-macos.sh
poetry run tox -e mlserver
else
poetry run tox -e mlserver -- -- -n auto
fi
test-runtimes:
strategy:
fail-fast: false
matrix:
os:
- ubuntu-22.04
- macos-13
python-version:
- "3.9"
- "3.10"
tox-environment:
- sklearn
- xgboost
- lightgbm
- mlflow
- huggingface
- alibi-explain
- alibi-detect
- catboost
is-pr:
- ${{ github.event_name == 'pull_request' }}
# exclude:
# # MacOS tests take a lot of time, so we will run them only on merge
# # From https://github.com/orgs/community/discussions/26253
# - is-pr: true
# os: macos-13
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Install OpenMP (in MacOS)
if: runner.os == 'macOS'
run: brew install libomp
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
auto-activate-base: false
- name: Install Poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: false
- name: Install dependencies
run: poetry install --only test
- name: Test
run: |
if [[ ${{ runner.os == 'macOS' }} ]]; then
source ./hack/activate-libomp-macos.sh
fi
poetry run tox -c ./runtimes/${{ matrix.tox-environment }} -- -- -n auto
# test-runtimes:
# strategy:
# fail-fast: false
# matrix:
# os:
# - ubuntu-22.04
# - macos-13
# python-version:
# - "3.9"
# - "3.10"
# tox-environment:
# - sklearn
# - xgboost
# - lightgbm
# - mlflow
# - huggingface
# - alibi-explain
# - alibi-detect
# - catboost
# is-pr:
# - ${{ github.event_name == 'pull_request' }}
# # exclude:
# # # MacOS tests take a lot of time, so we will run them only on merge
# # # From https://github.com/orgs/community/discussions/26253
# # - is-pr: true
# # os: macos-13
# runs-on: ${{ matrix.os }}
# steps:
# - uses: actions/checkout@v4
# - name: Install OpenMP (in MacOS)
# if: runner.os == 'macOS'
# run: brew install libomp
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v5
# with:
# python-version: ${{ matrix.python-version }}
# - uses: conda-incubator/setup-miniconda@v3
# with:
# auto-update-conda: true
# auto-activate-base: false
# - name: Install Poetry
# uses: snok/install-poetry@v1
# with:
# virtualenvs-create: false
# - name: Install dependencies
# run: poetry install --only test
# - name: Test
# run: |
# if [[ ${{ runner.os == 'macOS' }} ]]; then
# source ./hack/activate-libomp-macos.sh
# fi
# poetry run tox -c ./runtimes/${{ matrix.tox-environment }} -- -- -n auto

# Ensure that having all the runtimes installed together works
test-all-runtimes:
# if: github.event_name == 'push'
strategy:
fail-fast: false
matrix:
os:
- ubuntu-22.04
- macos-13
python-version:
- "3.9"
- "3.10"
runs-on: ${{ matrix.os }}
steps:
- name: Maximize build space
if: runner.os == 'Linux'
uses: easimon/maximize-build-space@master
with:
remove-dotnet: 'true'
remove-haskell: 'true'
remove-android: 'true'
remove-codeql: 'true'
remove-docker-images: 'true'
overprovision-lvm: 'true'
swap-size-mb: 1024
- uses: actions/checkout@v4
- name: Setup Docker (missing on MacOS)
if: runner.os == 'macOS'
run: ./hack/install-docker-macos.sh
- name: Install OpenMP (in MacOS)
if: runner.os == 'macOS'
run: brew install libomp
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
auto-activate-base: false
- name: Install Poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: false
- name: Install dependencies
run: poetry install --only test
- name: Test
run: |
if [[ ${{ runner.os == 'macOS' }} ]]; then
source ./hack/activate-libomp-macos.sh
poetry run tox -e all-runtimes
else
poetry run tox -e all-runtimes -- -- -n auto
if
# # Ensure that having all the runtimes installed together works
# test-all-runtimes:
# # if: github.event_name == 'push'
# strategy:
# fail-fast: false
# matrix:
# os:
# - ubuntu-22.04
# - macos-13
# python-version:
# - "3.9"
# - "3.10"
# runs-on: ${{ matrix.os }}
# steps:
# - name: Maximize build space
# if: runner.os == 'Linux'
# uses: easimon/maximize-build-space@master
# with:
# remove-dotnet: 'true'
# remove-haskell: 'true'
# remove-android: 'true'
# remove-codeql: 'true'
# remove-docker-images: 'true'
# overprovision-lvm: 'true'
# swap-size-mb: 1024
# - uses: actions/checkout@v4
# - name: Setup Docker (missing on MacOS)
# if: runner.os == 'macOS'
# run: ./hack/install-docker-macos.sh
# - name: Install OpenMP (in MacOS)
# if: runner.os == 'macOS'
# run: brew install libomp
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v5
# with:
# python-version: ${{ matrix.python-version }}
# - uses: conda-incubator/setup-miniconda@v3
# with:
# auto-update-conda: true
# auto-activate-base: false
# - name: Install Poetry
# uses: snok/install-poetry@v1
# with:
# virtualenvs-create: false
# - name: Install dependencies
# run: poetry install --only test
# - name: Test
# run: |
# if [[ ${{ runner.os == 'macOS' }} ]]; then
# source ./hack/activate-libomp-macos.sh
# poetry run tox -e all-runtimes
# else
# poetry run tox -e all-runtimes -- -- -n auto
# fi

2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ commands =
{toxinidir}/runtimes/mllib \
{toxinidir}/runtimes/lightgbm \
{toxinidir}/runtimes/mlflow \
{toxinidir}/runtimes/huggingface \
{toxinidir}/runtimes/huggingface
set_env =
GITHUB_SERVER_URL = {env:GITHUB_SERVER_URL:https\://github.com}
GITHUB_REPOSITORY = {env:GITHUB_REPOSITORY:SeldonIO/MLServer}
Expand Down

0 comments on commit 4d5a18d

Please sign in to comment.