Skip to content

Commit 59b4871

Browse files
authored
Merge branch 'develop' into GEOPY-2045
2 parents 74b74b6 + 826b686 commit 59b4871

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

.pre-commit-config.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,14 @@ repos:
2626
rev: v1.1.0
2727
hooks:
2828
- id: prepare-commit-msg
29-
- id: check-commit-msg
29+
- id: check-commit-msg
30+
- repo: https://github.com/pre-commit/pre-commit-hooks
31+
rev: v5.0.0
32+
hooks:
33+
- id: check-json
34+
exclude_types: [jupyter]
35+
- id: check-toml
36+
- id: check-yaml
37+
- id: check-added-large-files
38+
- id: check-merge-conflict
39+
- id: detect-private-key

recipe.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,22 @@ requirements:
2626
- pip
2727
run:
2828
- python >=${{ python_min }}
29+
# Mira packages
30+
- geoh5py >=0.11.0a, <0.12.dev
31+
# direct dependencies
2932
- discretize >=0.11
3033
- geoana >=0.7.0
31-
- geoh5py >=0.11.0a1, <0.12.dev
3234
- libdlf *
3335
- matplotlib-base
3436
- numpy >=1.22
3537
- pymatsolver >=0.3
3638
- scipy >=1.8
3739
run_constraints:
3840
- choclo >=0.3.0
39-
- dask-core *
40-
- distributed *
4141
- fsspec >=0.3.3
4242
- scikit-learn >=1.2
43-
- zarr *
43+
run_exports:
44+
- libblas * *mkl
4445

4546
tests:
4647
- python:
@@ -70,11 +71,6 @@ tests:
7071
- simpeg.utils.drivers
7172
- simpeg.regularization
7273
- simpeg.meta
73-
- requirements:
74-
run:
75-
- pip
76-
script:
77-
- pip check
7874

7975
about:
8076
summary: "Mira Geoscience fork of SimPEG: Simulation and Parameter Estimation in Geophysics"

0 commit comments

Comments
 (0)