Skip to content

Commit fed0bc6

Browse files
committed
Cleanup dependency list
- Add concurrency to workflows - Fixup mypy config - Update uv lockfile
1 parent e7cbe26 commit fed0bc6

8 files changed

Lines changed: 341 additions & 508 deletions

File tree

.github/workflows/docs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ permissions:
44

55
on: [pull_request]
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
711
env:
812
UV_FROZEN: true # https://docs.astral.sh/uv/configuration/environment/#uv_frozen
913

.github/workflows/precommit.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ permissions:
44

55
on: [push, pull_request]
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
711
env:
812
UV_FROZEN: true # https://docs.astral.sh/uv/configuration/environment/#uv_frozen
913

.github/workflows/testing.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ permissions:
44

55
on: [pull_request]
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
711
env:
812
UV_FROZEN: true # https://docs.astral.sh/uv/configuration/environment/#uv_frozen
913

.mypy.ini

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
11
[mypy]
2-
3-
[mypy-iterative_ensemble_smoother._ies.*]
4-
ignore_missing_imports = True
5-
ignore_errors = True
6-
7-
[mypy-iterative_ensemble_smoother/experimental.*]
8-
ignore_missing_imports = True
9-
ignore_errors = True

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
build:
44
os: ubuntu-22.04
55
tools:
6-
python: "3.10"
6+
python: "3.12"
77

88
python:
99
install:

pyproject.toml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ classifiers=[
1515
"Programming Language :: Python :: 3.13",
1616
"Programming Language :: Python :: 3.14",
1717
]
18-
dependencies = ["numpy", "scipy", "joblib", "networkx", "scikit-learn"]
18+
dependencies = [
19+
"joblib",
20+
"networkx",
21+
"numpy",
22+
"scikit-learn",
23+
"scipy",
24+
]
1925
dynamic=["version"] # setuptools_scm extracts Python package versions from git
2026

2127
authors = [
@@ -37,6 +43,16 @@ text = "GPL-3.0"
3743
"Documentation" = "https://iterative_ensemble_smoother.readthedocs.io/en/stable/"
3844

3945
[project.optional-dependencies]
46+
dev = [
47+
"pytest",
48+
"pytest-snapshot",
49+
"pytest-memray",
50+
"pre-commit",
51+
"matplotlib",
52+
"mypy",
53+
"pandas",
54+
"p_tqdm",
55+
]
4056
doc = [
4157
"sphinx",
4258
"setuptools",
@@ -53,25 +69,10 @@ doc = [
5369
"ipykernel",
5470
"ipywidgets",
5571
"numpydoc",
56-
"scipy",
5772
"jinja2",
5873
"myst_nb",
5974
"lxml_html_clean"
6075
]
61-
dev = [
62-
"pytest",
63-
"pytest-snapshot",
64-
"pytest-memray",
65-
"tox",
66-
"pre-commit",
67-
"matplotlib",
68-
"scipy",
69-
"mypy",
70-
"pandas",
71-
"p_tqdm",
72-
"pylint",
73-
"gaussianfft"
74-
]
7576
# 'scikit-sparse' version and SuiteSparse must match (depends on Ubuntu)
7677
sparse = ["scikit-sparse==0.4.16"]
7778
# setuptools_scm also writes the version to a file so that one can use the
@@ -162,6 +163,7 @@ exclude = [
162163
"dist",
163164
"node_modules",
164165
"venv",
166+
"src/iterative_ensemble_smoother/_version.py",
165167
]
166168

167169
# Allow unused variables when underscore-prefixed.

tests/test_esmda.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def setup_large():
215215

216216

217217
class TestOverwriteMemory:
218-
@pytest.mark.limit_memory("54 MB")
218+
@pytest.mark.limit_memory("58 MB")
219219
def test_ESMDA_memory_usage_without_overwrite(self, setup_large):
220220
X_prior, Y_prior, covariance, observations = setup_large
221221

@@ -224,7 +224,7 @@ def test_ESMDA_memory_usage_without_overwrite(self, setup_large):
224224
esmda.prepare_assimilation(Y=Y_prior, overwrite=False)
225225
esmda.assimilate_batch(X=X_prior, overwrite=False)
226226

227-
@pytest.mark.limit_memory("46 MB")
227+
@pytest.mark.limit_memory("50 MB")
228228
def test_ESMDA_memory_usage_with_overwrite(self, setup_large):
229229
X_prior, Y_prior, covariance, observations = setup_large
230230

uv.lock

Lines changed: 308 additions & 481 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)