Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/install-meridian/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ runs:
cache-dependency-path: '**/pyproject.toml'
- shell: bash
run: |
pip install -e proto --config-settings editable_mode=strict
pip install -e .${{ inputs.extras }} --config-settings editable_mode=strict
pip freeze

69 changes: 46 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,6 @@ env:
USE_PYTHON_VERSION: "3.11"

jobs:
pytest:
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
max-parallel: 3
matrix:
python-version: ["3.10", "3.11", "3.12"]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.python-version }}
cancel-in-progress: true
name: pytest (python-${{ matrix.python-version }})
steps:
- uses: actions/checkout@v4
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
- uses: ./.github/actions/install-meridian
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
with:
python_version: ${{ matrix.python-version }}
# Run tests (in parallel)
- name: Run core tests
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
run: pytest -vv -n auto

# Build meridian "core" and "mmm-proto-schema" distributions.
build-distributions:
name: Build distributions
Expand Down Expand Up @@ -63,3 +40,49 @@ jobs:
uses: ./.github/actions/version-check
with:
python_version: ${{ env.USE_PYTHON_VERSION }}

pytest:
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
max-parallel: 3
matrix:
python-version: ["3.10", "3.11", "3.12"]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.python-version }}
cancel-in-progress: true
name: pytest (python-${{ matrix.python-version }})
steps:
- uses: actions/checkout@v4
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
- uses: ./.github/actions/install-meridian
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
with:
python_version: ${{ matrix.python-version }}
# Run tests (in parallel)
- name: Run core tests
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
run: pytest -vv -n auto --ignore=schema

pytest-schema:
runs-on: ubuntu-latest
timeout-minutes: 20
name: pytest-schema
steps:
- uses: actions/checkout@v4
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
- uses: actions/setup-python@v5
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
with:
python-version: ${{ matrix.python-version }}
cache: pip
cache-dependency-path: '**/pyproject.toml'
- name: Install proto dependencies and test tools
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
run: |
pip install -e proto --config-settings editable_mode=strict
pip install -e . --config-settings editable_mode=strict
pip install pytest pytest-xdist
- name: Run schema tests
if: ${{ !contains(github.event.head_commit.message, '#skip-pytest') }}
run: pytest -vv -n auto schema
3 changes: 2 additions & 1 deletion proto/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ keywords = [
"protobuf",
]

version = "1.0.0"
version = "1.0.0.post1"

dependencies = [
"googleapis-common-protos",
"protobuf",
"semver",
"tensorflow",
]

Expand Down
Loading