From e3b01760057780c4c30cb5648e8dd27c05624453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Eide?= Date: Fri, 13 Sep 2024 13:07:53 +0200 Subject: [PATCH] Build docs differently --- .github/workflows/doctest.yml | 2 +- .../workflows/mac-run-tests-build-docs.yml | 2 +- .github/workflows/run-tests-build-docs.yml | 2 +- .github/workflows/test_everest.yml | 57 ------------------- 4 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/test_everest.yml diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 92c53c59440..3c1bdaeee65 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -36,7 +36,7 @@ jobs: run: pip install uv - run: | - uv pip install -e ".[dev]" + uv pip install -e ".[dev, everest]" - name: Test doctest run: | diff --git a/.github/workflows/mac-run-tests-build-docs.yml b/.github/workflows/mac-run-tests-build-docs.yml index c2f0ac5c461..15a669d87bd 100644 --- a/.github/workflows/mac-run-tests-build-docs.yml +++ b/.github/workflows/mac-run-tests-build-docs.yml @@ -70,7 +70,7 @@ jobs: run: | pip install git+https://github.com/equinor/everest-models.git mkdir tmp - sphinx-build -W -b html -d tmp/doctrees docs/everest/source {envtmpdir}/html + sphinx-build -n -v -E -W ./docs/everest ./tmp/everest_docs - name: Run tests requiring everest-models if: matrix.test_type == 'everest-models-test' diff --git a/.github/workflows/run-tests-build-docs.yml b/.github/workflows/run-tests-build-docs.yml index c79c1e1bcc9..52d94c62341 100644 --- a/.github/workflows/run-tests-build-docs.yml +++ b/.github/workflows/run-tests-build-docs.yml @@ -62,7 +62,7 @@ jobs: run: | pip install git+https://github.com/equinor/everest-models.git mkdir tmp - sphinx-build -W -b html -d tmp/everest/doctrees docs/everest/source {envtmpdir}/html + sphinx-build -n -v -E -W ./docs/everest ./tmp/everest_docs - name: Run tests requiring everest-models if: matrix.test_type == 'everest-models-test' diff --git a/.github/workflows/test_everest.yml b/.github/workflows/test_everest.yml deleted file mode 100644 index 3ee54a2cce1..00000000000 --- a/.github/workflows/test_everest.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Test everest - -# This job checks whether current main of everest -# is compatible with the changes. It is not required to pass -# before merging, but breakage should be followed by fix in everest -# after merge. - -on: [pull_request] - -env: - UV_SYSTEM_PYTHON: 1 - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} - -jobs: - test-everest: - name: Test everest - timeout-minutes: 40 - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ['3.12'] - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - - name: Install uv - run: pip install uv - - - name: Install ert - run: | - uv pip install . - - - name: Install everest and dependencies - run: | - git clone https://github.com/equinor/everest.git - uv pip install git+https://github.com/equinor/everest-models.git - - - name: Test everest - env: - QT_QPA_PLATFORM: 'minimal' - NO_PROJECT_RES: 1 - run: | - pushd everest - uv pip install ".[test]" - - pytest tests -n 4 --dist loadgroup -m "not ui_test" - pytest tests -m "ui_test"