Skip to content

Commit e474e14

Browse files
committed
Merge branch 'release/0.3.0'
2 parents 7cb6a1b + 8901e9b commit e474e14

286 files changed

Lines changed: 39034 additions & 18721 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/issue_to_jira.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ jobs:
1010
secrets: inherit
1111
with:
1212
project-key: 'GEOPY'
13+
components: '[{"name": "simpeg"}]'

.github/workflows/python_analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ jobs:
3434
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
3535
with:
3636
package-manager: 'conda'
37-
python-versions: '["3.10", "3.11"]'
37+
python-versions: '["3.10", "3.11", "3.12"]'
3838
os: '["ubuntu-latest", "windows-latest"]'
3939
cache-number: 1
4040
codecov-reference-python-version: '3.10'
41-
codecov-reference-os: '["windows-latest"]'
41+
codecov-reference-os: '["ubuntu-latest"]'
4242
timeout-minutes: 40
4343
secrets:
4444
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/python_deploy_dev.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
with:
1717
package-name: 'simpeg-drivers'
1818
python-version: '3.10'
19-
source-repo-names: '["public-conda-dev-local", "conda-forge-dev-remote"]'
20-
publish-repo-names: '["public-conda-dev"]'
19+
source-repo-names: '["public-noremote-conda-dev"]'
20+
conda-channels: '["conda-forge"]'
21+
publish-repo-names: '["public-noremote-conda-dev"]'
2122
secrets:
2223
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
2324
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}

.github/workflows/python_deploy_prod.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ on:
1111
publish-conda:
1212
description: 'Publish Conda package'
1313
required: false
14+
type: boolean
1415
default: true
1516
publish-pypi:
1617
description: 'Publish PyPI package'
1718
required: false
19+
type: boolean
1820
default: true
1921

2022
concurrency:
@@ -27,7 +29,7 @@ jobs:
2729
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
2830
if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
2931
with:
30-
virtual-repo-names: '["public-conda-prod"]'
32+
virtual-repo-names: '["public-noremote-conda-prod"]'
3133
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
3234
secrets:
3335
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
- id: pycln
1818
args: [--config=pyproject.toml]
1919
- repo: https://github.com/astral-sh/ruff-pre-commit
20-
rev: v0.9.1
20+
rev: v0.9.9
2121
hooks:
2222
- id: ruff
2323
args:
@@ -62,7 +62,7 @@ repos:
6262
types: [python]
6363
exclude: ^(devtools|docs)/
6464
- repo: https://github.com/codespell-project/codespell
65-
rev: v2.3.0
65+
rev: v2.4.1
6666
hooks:
6767
- id: codespell
6868
exclude: (-lock\.ya?ml|\benvironments/.*\.ya?ml|\.ipynb|^THIRD_PARTY_SOFTWARE\.rst)$
@@ -76,7 +76,6 @@ repos:
7676
exclude_types: [jupyter]
7777
- id: check-toml
7878
- id: check-yaml
79-
exclude: ^recipe.yaml$
8079
- id: check-added-large-files
8180
- id: check-case-conflict
8281
- id: check-merge-conflict
@@ -87,6 +86,7 @@ repos:
8786
- id: mixed-line-ending
8887
exclude: ^\.idea/.*\.xml$
8988
- id: name-tests-test
89+
exclude: testing_utils.py
9090
- id: pretty-format-json
9191
args:
9292
- --autofix

deps-lock-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ include_dev: True
22
py_versions:
33
- "3.10"
44
- "3.11"
5+
- "3.12"

docs/_toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ chapters:
1111
- file: inversion/regularization
1212
- file: inversion/mesh_design
1313
- file: inversion/joint_inversion
14+
- file: inversion/depth_of_investigation
1415
- file: case_study/introduction
1516
sections:
1617
- file: case_study/background

docs/case_study/airborne_tem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/background.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/dc_resistivity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

0 commit comments

Comments
 (0)