Add dependency groups for uv workflows

equinor · Mar 7, 2025 · b557496 · b557496
1 parent 4e6bd03
commit b557496
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 8 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -153,7 +153,7 @@ jobs:
 
     - name: Install ert
       run: |
-        uv sync --extra everest --extra dev
+        uv sync
 
     - name: Test docs
       run: |

diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml
@@ -32,7 +32,7 @@ jobs:
           enable-cache: true
           python-version: '3.12'
       - run: |
-          uv sync --extra everest --extra dev
+          uv sync
           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
@@ -41,7 +41,7 @@ jobs:
 
     - name: Install ERT with style dependencies
       run: |
-        uv sync --extra style
+        uv sync
 
     - name: Run style check
       if: ${{ always() }}

diff --git a/.github/workflows/test_ert.yml b/.github/workflows/test_ert.yml
@@ -46,7 +46,7 @@ jobs:
 
     - name: Install ert
       run: |
-        uv sync --extra everest --extra dev
+        uv sync
 
     - name: GUI Test
       if: inputs.test-type == 'gui-tests'

diff --git a/.github/workflows/test_ert_with_flow.yml b/.github/workflows/test_ert_with_flow.yml
@@ -35,7 +35,7 @@ jobs:
 
     - name: Install ert and everest
       run: |
-        uv sync --extra everest --extra dev
+        uv sync
         uv pip install git+https://github.com/equinor/everest-models
 
     - name: Install flow

diff --git a/.github/workflows/test_ert_with_slurm.yml b/.github/workflows/test_ert_with_slurm.yml
@@ -35,7 +35,7 @@ jobs:
 
     - name: Install ert
       run: |
-        uv sync --extra dev
+        uv sync
 
     - name: Install and setup slurm
       run: |

diff --git a/.github/workflows/test_everest.yml b/.github/workflows/test_everest.yml
@@ -43,7 +43,7 @@ jobs:
 
     - name: Install Everest and dependencies
       run: |
-        uv sync --extra everest --extra dev
+        uv sync
 
     - name: Run Tests Linux
       if: ${{ inputs.test-type == 'test' && runner.os != 'macOS'}}

diff --git a/.github/workflows/typing.yml b/.github/workflows/typing.yml
@@ -41,7 +41,7 @@ jobs:
 
     - name: Install ERT and dependencies
       run: |
-        uv sync --extra everest --extra dev --extra types
+        uv sync
 
     - run: echo ::add-matcher::.github/mypy-matcher.json
     - name: Run mypy

diff --git a/pyproject.toml b/pyproject.toml
@@ -174,6 +174,26 @@ timeout = 360
 [tool.setuptools_scm]
 write_to = "src/ert/shared/version.py"
 
+[dependency-groups]
+dev = [
+    "ert[dev]",
+]
+types = [
+    "ert[types]",
+]
+style = [
+    "ert[style]",
+]
+everest = [
+    "ert[everest]",
+]
+all = [
+    { include-group = "dev" },
+    { include-group = "style" },
+    { include-group = "everest" },
+    { include-group = "types" },
+]
+
 [tool.ruff]
 src = ["src"]
 line-length = 88
@@ -252,3 +272,4 @@ PYQT6 = true
 
 [tool.uv]
 fork-strategy = "requires-python"
+default-groups = ["all"]
diff --git a/uv.lock b/uv.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -153,7 +153,7 @@ jobs: @@
         - name: Install ert
           run: |
-            uv sync --extra everest --extra dev
+            uv sync
         - name: Test docs
           run: |
@@ Expand Down @@