Skip to content

Commit 5944609

Browse files
authored
Merge pull request #131 from MiraGeoscience/GEOPY-2661
GEOPY-2661: update recipe to use newer geoh5py
2 parents ef94a62 + b6716dc commit 5944609

5 files changed

Lines changed: 25 additions & 24 deletions

File tree

.github/workflows/python_deploy_dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
contents: write
2020
with:
2121
package-name: 'mira-simpeg'
22-
python-version: '3.10'
22+
python-version: '3.12'
2323
source-repo-names: '["public-noremote-conda-dev"]'
2424
conda-channels: '["conda-forge"]'
2525
publish-repo-names: '["public-noremote-conda-dev"]'
@@ -36,7 +36,7 @@ jobs:
3636
package-manager: 'setuptools'
3737
package-name: 'mira-simpeg'
3838
version-tag: ${{ github.ref_name }}
39-
python-version: '3.10'
39+
python-version: '3.12'
4040
virtual-repo-names: '["public-pypi-dev", "test-pypi"]'
4141
secrets:
4242
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}

.github/zizmor.yml

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

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
77
name = "mira-simpeg"
88
description = "Mira Geoscience fork of SimPEG: Simulation and Parameter Estimation in Geophysics"
99
readme = "README.rst"
10-
requires-python = ">=3.10,<4.0"
10+
requires-python = ">=3.12,<4.0"
1111

1212
authors = [
1313
{ name = "SimPEG developers", email = "rowanc1@gmail.com" },
@@ -18,7 +18,7 @@ keywords = ["geophysics", "inverse problem"]
1818
dependencies = [
1919
"discretize>=0.11",
2020
"geoana>=0.7.0",
21-
"geoh5py>=0.12.0rc, <0.14.dev",
21+
"geoh5py~=0.13.0a2",
2222
"libdlf",
2323
"matplotlib",
2424
"numpy>=1.22",

recipe.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ context:
44
name: "mira-simpeg"
55
# Read version from _version.txt file generated by setuptools_scm
66
version: ${{ load_from_file("_version.txt") | default("0.0.0.dev0") }}
7-
python_min: "3.10"
7+
python_min: "3.12"
88
module_name: simpeg
99

1010
package:
@@ -21,14 +21,14 @@ build:
2121

2222
requirements:
2323
host:
24-
- python 3.10.*
24+
- python ${{ python_min }}.*
2525
- setuptools >=64
2626
- setuptools_scm >=8
2727
- pip
2828
run:
2929
- python >=${{ python_min }}
3030
# Mira packages
31-
- geoh5py >=0.12.0rc, <0.14.dev
31+
- geoh5py >=0.13.0a2, 0.13.*
3232
# direct dependencies
3333
- dask-core *
3434
- discretize >=0.11

zizmor.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,19 @@
1+
# Zizmor configuration
2+
# --------------------
3+
#
4+
# This file configures zizmor. This is not a workflow that gets run in GitHub
5+
# Actions.
6+
#
7+
# References: https://woodruffw.github.io/zizmor/configuration
8+
19
rules:
10+
unpinned-uses:
11+
config:
12+
policies:
13+
# Mimic default behaviour: official actions can get pinned by tag.
14+
actions/*: ref-pin
15+
# Allow to use tags to pin reviewdog actions.
16+
reviewdog/action-black: ref-pin
17+
reviewdog/action-flake8: ref-pin
18+
# Allow to use tags to pin MiraGeoscience actions.
19+
MiraGeoscience/*: ref-pin

0 commit comments

Comments
 (0)