Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run everest tests before publishing to pypi #8756

Merged
merged 1 commit into from
Oct 3, 2024
Merged
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
72 changes: 61 additions & 11 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and test ERT and docs
name: Build and test

on:
push:
Expand Down Expand Up @@ -29,7 +29,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

test-linux:
test-linux-ert:
strategy:
fail-fast: false
matrix:
Expand All @@ -43,6 +43,20 @@ jobs:
test-type: ${{ matrix.test-type }}
secrets: inherit

test-linux-everest:
strategy:
fail-fast: false
matrix:
test-type: [ 'test', 'ui-test', 'integration-test', 'everest-models-test', 'doc', 'everest-docs-entry-test' ]
python-version: [ '3.8', '3.11', '3.12' ]
os: [ ubuntu-latest ]
uses: ./.github/workflows/test_everest.yml
with:
os: ${{ matrix.os }}
python-version: ${{ matrix.python-version }}
test-type: ${{ matrix.test-type }}
secrets: inherit

test-slurm:
strategy:
fail-fast: false
Expand All @@ -55,35 +69,71 @@ jobs:
python-version: ${{ matrix.python-version }}
secrets: inherit

test-mac-for-tags:
if: github.ref_type == 'tag' # only test all variants for tags
test-mac-ert:
if: github.ref_type != 'tag' # when not tag
strategy:
fail-fast: false
matrix:
test-type: [ 'performance-tests', 'unit-tests', 'gui-tests', 'cli-tests' ]
python-version: [ '3.12' ]
os: [ 'macos-latest' ]
uses: ./.github/workflows/test_ert.yml
with:
os: ${{ matrix.os }}
python-version: ${{ matrix.python-version }}
test-type: ${{ matrix.test-type }}
secrets: inherit

test-mac-everest:
if: github.ref_type != 'tag' # when not tag
strategy:
fail-fast: false
matrix:
test-type: [ 'test', 'integration-test', 'everest-models-test' ]
python-version: [ '3.12' ]
os: [ 'macos-latest' ]
uses: ./.github/workflows/test_ert.yml
with:
os: ${{ matrix.os }}
python-version: ${{ matrix.python-version }}
test-type: ${{ matrix.test-type }}
secrets: inherit


test-mac-for-tags-everest:
if: github.ref_type == 'tag' # only test all variants for tags
strategy:
fail-fast: false
matrix:
test-type: [ 'test', 'integration-test', 'everest-models-test' ]
python-version: [ '3.8', '3.12' ]
os: [ 'macos-13', 'macos-14']
exclude:
- os: 'macos-14'
python-version: '3.8'
- os: 'macos-13'
python-version: '3.12'

uses: ./.github/workflows/test_ert.yml
uses: ./.github/workflows/test_everest.yml
with:
os: ${{ matrix.os }}
python-version: ${{ matrix.python-version }}
test-type: ${{ matrix.test-type }}
secrets: inherit

test-mac:
if: github.ref_type != 'tag' # when not tag
test-mac-for-tags-ert:
if: github.ref_type == 'tag' # only test all variants for tags
strategy:
fail-fast: false
matrix:
test-type: [ 'performance-tests', 'unit-tests', 'gui-tests', 'cli-tests' ]
python-version: [ '3.12' ]
os: [ 'macos-latest' ]
python-version: [ '3.8', '3.12' ]
os: [ 'macos-13', 'macos-14']
exclude:
- os: 'macos-14'
python-version: '3.8'
- os: 'macos-13'
python-version: '3.12'

uses: ./.github/workflows/test_ert.yml
with:
os: ${{ matrix.os }}
Expand Down Expand Up @@ -139,7 +189,7 @@ jobs:
publish:
name: Publish to PyPI
runs-on: ubuntu-latest
needs: [build-wheels, test-linux, test-mac-for-tags, docs-ert]
needs: [build-wheels, test-linux-ert, test-linux-everest, test-mac-for-tags-ert, test-mac-for-tags-everest, docs-ert]
permissions:
id-token: write

Expand Down
66 changes: 37 additions & 29 deletions .github/workflows/test_everest.yml
Original file line number Diff line number Diff line change
@@ -1,79 +1,87 @@
name: everest-run-tests-build-docs

on:
pull_request:
workflow_dispatch:
push:
branches:
- main
tags: "*"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
workflow_call:
inputs:
os:
type: string
python-version:
type: string
test-type:
type: string

env:
NO_PROJECT_RES: 1
UV_SYSTEM_PYTHON: 1

jobs:
tests:
name: "py_${{ matrix.python-version }}_${{ matrix.test_type }}"
tests-everest:
name: Run everest tests
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.11', '3.12']
os: [ubuntu-latest]
test_type: ['doc', 'ui-test', 'test', 'integration-test', 'everest-models-test']
runs-on: ${{ matrix.os }}
runs-on: ${{ inputs.os }}

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}

- name: Set up Python ${{ inputs.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ inputs.python-version }}

- name: Install uv
uses: astral-sh/setup-uv@v3

- name: Install HDF5 source files on mac
if: ${{ inputs.os == 'macOS' && (inputs.python-version == '3.8' || inputs.python-version == '3.9' )}}
run: brew install hdf5

- name: Install Everest and dependencies
run: |
uv pip install ".[dev,everest]"

- name: Run Tests
if: matrix.test_type == 'test'
- name: Run Tests Linux
if: ${{ inputs.test-type == 'test' && inputs.os != 'macOS'}}
run: |
pytest tests/everest -n 4 -m "not ui_test and not integration_test" --dist loadgroup -sv

- name: Run Integration Tests
if: matrix.test_type == 'integration-test'
- name: Run Tests macOS
if: ${{ inputs.test-type == 'test' && inputs.os == 'macOS'}}
run: |
python -m pytest tests/everest -n 4 -m "not ui_test and not integration_test and not fails_on_macos_github_workflow" --dist loadgroup -sv

- name: Run Integration Tests Linux
if: ${{inputs.test-type == 'integration-test' && inputs.os != 'macOS'}}
run: |
pytest tests/everest -n 4 -m "integration_test" --dist loadgroup

- name: Run Integration Tests macOS
if: ${{inputs.test-type == 'integration-test' && inputs.os == 'macOS'}}
run: |
python -m pytest tests/everest -n 4 -m "integration_test and not fails_on_macos_github_workflow" --dist loadgroup

- name: Run UI Tests
if: matrix.test_type == 'ui-test'
if: inputs.test-type == 'ui-test'
env:
QT_QPA_PLATFORM: 'minimal'
run: |
python -m pytest tests/everest -m "ui_test"

- name: Build Documentation
if: matrix.test_type == 'doc'
if: inputs.test-type == 'doc'
Copy link
Contributor

@larsevj larsevj Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest maybe combining this and the test doc entry points, and making it a separate step in the build and test workflow, so that it can be run only once for one python version to reduce the number of total workflows run? Similar to how we test the building of the ert docs.
But this can probably be done later in another pr.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added so docs are only build for py312

run: |
uv pip install git+https://github.com/equinor/everest-models.git
mkdir tmp
sphinx-build -n -v -E -W ./docs/everest ./tmp/everest_docs

- name: Run tests requiring everest-models
if: matrix.test_type == 'everest-models-test'
if: inputs.test-type == 'everest-models-test'
run: |
uv pip install git+https://github.com/equinor/everest-models.git
python -m pytest tests/everest -n 4 -m everest_models_test --dist loadgroup

- name: Test docs entry point
if: matrix.test_type == 'everest-docs-entry-test'
if: inputs.test-type == 'everest-docs-entry-test'
run: |
python -m everest.docs
81 changes: 0 additions & 81 deletions .github/workflows/test_everest_macos.yml

This file was deleted.

Loading