Skip to content

Commit 13ac913

Browse files
committed
Merge branch 'develop' into GEOPY-2715
# Conflicts: # environments/py-3.12-linux-64-dev.conda.lock.yml # environments/py-3.12-linux-64.conda.lock.yml # environments/py-3.12-win-64-dev.conda.lock.yml # environments/py-3.12-win-64.conda.lock.yml # environments/py-3.13-linux-64-dev.conda.lock.yml # environments/py-3.13-linux-64.conda.lock.yml # environments/py-3.13-win-64-dev.conda.lock.yml # environments/py-3.13-win-64.conda.lock.yml # environments/py-3.14-linux-64-dev.conda.lock.yml # environments/py-3.14-linux-64.conda.lock.yml # environments/py-3.14-win-64-dev.conda.lock.yml # environments/py-3.14-win-64.conda.lock.yml # py-3.12.conda-lock.yml # py-3.13.conda-lock.yml # py-3.14.conda-lock.yml
2 parents 725fc6f + 12cc3be commit 13ac913

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ version = "0.0.0.dev0"
7878
dask = "~2025.3.0" # also in simpeg[dask]
7979
discretize = "~0.12.0" # also in simpeg, grid-apps
8080
distributed = "~2025.3.0" # for dask[distributed]
81-
matplotlib-base = "~3.10.0" # from geoapps-utils
81+
matplotlib = "~3.10.0" # from geoapps-utils
8282
numpy = "~2.4.2"
8383
openpyxl = ">=3.1.2"
8484
pandas = ">=3.0.*"
@@ -88,7 +88,7 @@ python-mumps = "~0.0.6.0"
8888
rtree = "~1.4.0"
8989
scikit-learn = "~1.8.0"
9090
scipy = "~1.17.0"
91-
tqdm = "~4.66.1"
91+
tqdm = "^4.66.1"
9292
trimesh = "~4.1.3"
9393

9494
## Pip dependencies from Git repositories

0 commit comments

Comments
 (0)