diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 885012271a7..a21b60300be 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -40,7 +40,7 @@ jobs: - name: Install ert with dev-deps run: | - uv sync --extra dev + uv sync --group dev - name: Run benchmark run: | diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index be83255bea5..f662661c269 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -171,7 +171,7 @@ jobs: - name: Install ert run: | - uv sync --extra dev --extra everest + uv sync --extra everest --group dev - name: Make test directory run: | diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml index 68e1242b51f..2c584644456 100644 --- a/.github/workflows/codspeed.yml +++ b/.github/workflows/codspeed.yml @@ -28,7 +28,7 @@ jobs: with: python-version: '3.12' - run: | - uv sync --extra dev --extra everest + uv sync --extra everest --group dev uv pip uninstall pytest-benchmark uv pip install pytest-codspeed - uses: CodSpeedHQ/action@v3 diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 36a598f3104..140ad13f9be 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -39,7 +39,7 @@ jobs: - name: Install ERT with style dependencies run: | - uv sync --extra style + uv sync --group style - name: Run style check if: ${{ always() }} diff --git a/.github/workflows/test_ert.yml b/.github/workflows/test_ert.yml index e0e43de6749..c1c655a6bb0 100644 --- a/.github/workflows/test_ert.yml +++ b/.github/workflows/test_ert.yml @@ -37,7 +37,7 @@ jobs: - name: Install ert run: | - uv sync --extra dev --extra everest + uv sync --extra everest --group dev - name: GUI Test if: inputs.test-type == 'gui-tests' diff --git a/.github/workflows/test_ert_with_slurm.yml b/.github/workflows/test_ert_with_slurm.yml index 4009a9521bd..abae4467535 100644 --- a/.github/workflows/test_ert_with_slurm.yml +++ b/.github/workflows/test_ert_with_slurm.yml @@ -30,7 +30,7 @@ jobs: - name: Install ert run: | - uv sync --extra dev + uv sync --group dev - name: Install and setup slurm run: | diff --git a/.github/workflows/test_everest.yml b/.github/workflows/test_everest.yml index 5f241477fd0..f6251d55e61 100644 --- a/.github/workflows/test_everest.yml +++ b/.github/workflows/test_everest.yml @@ -37,7 +37,7 @@ jobs: - name: Install Everest and dependencies run: | - uv sync --extra dev --extra everest + uv sync --extra everest --group dev - name: Run Tests Linux if: ${{ inputs.test-type == 'test' && runner.os != 'macOS'}} diff --git a/.github/workflows/typing.yml b/.github/workflows/typing.yml index 24621f8d5a6..c48ae12daec 100644 --- a/.github/workflows/typing.yml +++ b/.github/workflows/typing.yml @@ -39,7 +39,7 @@ jobs: - name: Install ERT and dependencies run: | - uv sync --extra dev --extra types --extra everest + uv sync --extra everest --group dev --group types - run: echo ::add-matcher::.github/mypy-matcher.json - name: Run mypy ert diff --git a/pyproject.toml b/pyproject.toml index 57d5649f8c8..67fa89cddab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -91,6 +91,19 @@ wdupdate = "everest.jobs.scripts.wdupdate:main" Repository = "https://github.com/equinor/ert" [project.optional-dependencies] +everest = [ + "progressbar2", + "ruamel.yaml", + "fastapi", + "decorator", + "resdata", + "colorama", + "ropt[pandas]>=0.1,<0.11", + "ropt-dakota>=0.1,<0.11", + "seba-sqlite", +] + +[dependency-groups] dev = [ "furo", "hypothesis!=6.102.0,!=6.112.3,>=6.85", @@ -136,16 +149,11 @@ types = [ "types-psutil", "types-setuptools" ] -everest = [ - "progressbar2", - "ruamel.yaml", - "fastapi", - "decorator", - "resdata", - "colorama", - "ropt[pandas]>=0.1,<0.11", - "ropt-dakota>=0.1,<0.11", - "seba-sqlite", + +all = [ + { include-group = 'dev' }, + { include-group = 'style' }, + { include-group = 'types' }, ] [tool.setuptools]