Skip to content

Commit f5df0ab

Browse files
authored
Merge branch 'develop' into GEOPY-2023
2 parents c771234 + 77e2a29 commit f5df0ab

4 files changed

Lines changed: 101 additions & 95 deletions

File tree

.github/workflows/python_deploy_dev.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ concurrency:
1212
jobs:
1313
call-workflow-conda-publish:
1414
name: Publish development conda package on JFrog Artifactory
15-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@main
15+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_rattler_package.yml@main
1616
with:
1717
package-name: 'mira-simpeg'
1818
python-version: '3.10'
19-
virtual-repo-names: '["public-conda-dev"]'
19+
source-repo-names: '["public-conda-dev-local", "conda-forge-dev-remote"]'
20+
publish-repo-names: '["public-conda-dev"]'
2021
secrets:
2122
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
2223
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}

meta.yaml

Lines changed: 0 additions & 91 deletions
This file was deleted.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ dependencies = [
2020
"discretize>=0.11.0",
2121
"empymod>=2.0.0",
2222
"geoana>=0.5.0",
23-
"geoh5py>=0.11.0a1, <0.12",
23+
"geoh5py>=0.11.0a1, <0.12.dev",
2424
"matplotlib",
2525
"numpy>=1.20",
2626
"pandas",
27-
"pymatsolver>=0.2, <0.3.0",
27+
"pymatsolver>=0.3, <0.4.dev",
2828
"scikit-learn>=1.2",
2929
"scipy>=1.8.0",
3030
]

recipe.yaml

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
schema_version: 1
2+
3+
context:
4+
name: "mira-simpeg"
5+
version: "0.21.2.3a1"
6+
python_min: "3.10"
7+
8+
package:
9+
name: ${{ name|lower }}
10+
version: ${{ version }}
11+
12+
source:
13+
path: ../simpeg
14+
15+
build:
16+
number: 0
17+
noarch: python
18+
script: ${{ PYTHON }} -m pip install . -vv --no-deps
19+
20+
requirements:
21+
host:
22+
- python 3.10.*
23+
- poetry-core >=1.0.0
24+
- setuptools >=64
25+
- setuptools_scm >=8
26+
- pip
27+
run:
28+
- python >=${{ python_min }}
29+
- discretize >=0.10.0
30+
- empymod >=2.0.0
31+
- geoana >=0.5.0
32+
- geoh5py >=0.10.0, <0.11.dev
33+
- matplotlib-base
34+
- numpy >=1.20
35+
- pandas
36+
- pymatsolver >=0.3.0, <0.4.dev
37+
- scikit-learn >=1.2
38+
- scipy >=1.8.0
39+
run_constraints:
40+
- dask-core *
41+
- distributed *
42+
- fsspec >=0.3.3
43+
- zarr *
44+
45+
tests:
46+
- python:
47+
imports:
48+
- simpeg
49+
- simpeg.electromagnetics
50+
- simpeg.electromagnetics.analytics
51+
- simpeg.electromagnetics.frequency_domain
52+
- simpeg.electromagnetics.natural_source
53+
- simpeg.electromagnetics.natural_source.utils
54+
- simpeg.electromagnetics.static
55+
- simpeg.electromagnetics.static.resistivity
56+
- simpeg.electromagnetics.static.induced_polarization
57+
- simpeg.electromagnetics.static.spectral_induced_polarization
58+
- simpeg.electromagnetics.static.utils
59+
- simpeg.electromagnetics.time_domain
60+
- simpeg.electromagnetics.utils
61+
- simpeg.electromagnetics.viscous_remanent_magnetization
62+
- simpeg.flow
63+
- simpeg.flow.richards
64+
- simpeg.potential_fields
65+
- simpeg.potential_fields.gravity
66+
- simpeg.potential_fields.magnetics
67+
- simpeg.seismic
68+
- simpeg.seismic.straight_ray_tomography
69+
- simpeg.utils
70+
- simpeg.utils.drivers
71+
- simpeg.regularization
72+
- simpeg.meta
73+
- requirements:
74+
run:
75+
- pip
76+
script:
77+
- pip check
78+
79+
about:
80+
summary: "Mira Geoscience fork of SimPEG: Simulation and Parameter Estimation in Geophysics"
81+
description: |
82+
Simulation and Parameter Estimation in Geophysics - A python package for simulation and
83+
gradient based parameter estimation in the context of geophysical applications.
84+
85+
Warning: This is a fork created by Mira Geoscience.
86+
license: MIT
87+
license_file:
88+
- LICENSE
89+
homepage: https://docs.simpeg.xyz/
90+
repository: https://github.com/MiraGeoscience/simpeg
91+
documentation: https://docs.simpeg.xyz/
92+
93+
extra:
94+
recipe-maintainers:
95+
- SophieCurinier
96+
- sebhmg

0 commit comments

Comments
 (0)