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

Test out uv lockfile #9561

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Try with dependency groups
larsevj committed Dec 19, 2024
commit 3e080814d15b474472ab477a4e9ec6dd37248161
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ jobs:

- name: Install ert with dev-deps
run: |
uv sync --extra dev
uv sync --group dev

- name: Run benchmark
run: |
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -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: |
2 changes: 1 addition & 1 deletion .github/workflows/codspeed.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
@@ -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() }}
2 changes: 1 addition & 1 deletion .github/workflows/test_ert.yml
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion .github/workflows/test_ert_with_slurm.yml
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ jobs:

- name: Install ert
run: |
uv sync --extra dev
uv sync --group dev

- name: Install and setup slurm
run: |
2 changes: 1 addition & 1 deletion .github/workflows/test_everest.yml
Original file line number Diff line number Diff line change
@@ -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'}}
2 changes: 1 addition & 1 deletion .github/workflows/typing.yml
Original file line number Diff line number Diff line change
@@ -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
28 changes: 18 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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]