Skip to content

Commit

Permalink
Merge pull request #405 from MiraGeoscience/hotfix/0.8.1
Browse files Browse the repository at this point in the history
Hotfix/0.8.1
  • Loading branch information
andrewg-mira authored Sep 15, 2022
2 parents 73aa83f + be0ab80 commit 2cdf4be
Show file tree
Hide file tree
Showing 114 changed files with 15,075 additions and 14,388 deletions.
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ci:

repos:
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 22.6.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
Expand All @@ -27,7 +27,7 @@ repos:
# hooks:
# - id: flake8
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v2.37.2
hooks:
- id: pyupgrade
args: [--py37-plus]
Expand Down Expand Up @@ -59,7 +59,7 @@ repos:
exclude: (\.ipynb$)
entry: codespell -I .codespellignore
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.3.0
hooks:
- id: trailing-whitespace
exclude: \.mdj$
Expand All @@ -75,7 +75,7 @@ repos:
- id: mixed-line-ending
- id: name-tests-test
- repo: https://github.com/rstcheck/rstcheck
rev: v5.0.0
rev: v6.0.0.post1
hooks:
- id: rstcheck
additional_dependencies: [sphinx]
Expand Down
4 changes: 3 additions & 1 deletion assets/uijson/induced_polarization_forward.ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
"{b020a277-90e2-4cd7-84d6-612ee3f25051}",
"{4EA87376-3ECE-438B-BF12-3479733DED46}"
],
"optional": true,
"enabled": false,
"label": "Conductivity object",
"value": ""
},
Expand All @@ -63,7 +65,7 @@
"parent": "conductivity_model_object",
"label": "Conductivity (Siemens/m)",
"property": "",
"value": 0.0
"value": 0.001
},
"starting_model_object": {
"group": "Starting Model",
Expand Down
4 changes: 3 additions & 1 deletion assets/uijson/induced_polarization_inversion.ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
"{b020a277-90e2-4cd7-84d6-612ee3f25051}",
"{4EA87376-3ECE-438B-BF12-3479733DED46}"
],
"optional": true,
"enabled": false,
"label": "Conductivity object",
"value": ""
},
Expand All @@ -88,7 +90,7 @@
"parent": "conductivity_model_object",
"label": "Conductivity (Siemens/m)",
"property": "",
"value": 0.0
"value": 0.001
},
"starting_model_object": {
"group": "Starting Model",
Expand Down
Loading

0 comments on commit 2cdf4be

Please sign in to comment.