Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/issue_to_jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions: {}
jobs:
call-workflow-create-jira-issue:
if: startsWith(github.repository, 'MiraGeoscience/') # run on the Mira repo only
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-issue_to_jira.yml@v2
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-issue_to_jira.yml@v3
permissions:
contents: read
issues: write
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pr_jira_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ name: JIRA actions

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
types: [opened, synchronize, reopened, ready_for_review, edited]

jobs:
call-workflow-pr_jira_actions:
if: github.event.action != 'edited' || github.event.changes.title != null
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-pr_actions.yml@v3
permissions:
contents: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_deploy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:
jobs:
call-workflow-conda-publish:
name: Publish development conda package on JFrog Artifactory
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_rattler_package.yml@v2
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_rattler_package.yml@v3
permissions:
contents: write
with:
Expand All @@ -29,7 +29,7 @@ jobs:
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
call-workflow-pypi-publish:
name: Publish development pypi package (JFrog Artifactory, TestPyPI)
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@v2
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@v3
permissions:
contents: write
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_deploy_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
call-workflow-conda-release:
name: Publish production Conda package on JFrog Artifactory
if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@v2
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@v3
permissions:
contents: write
with:
Expand All @@ -41,7 +41,7 @@ jobs:
call-workflow-pypi-release:
name: Publish production PyPI package (JFrog Artifactory, PyPI)
if: ${{ github.event_name == 'release' || github.event.inputs.publish-pypi == 'true' }}
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_pypi_assets.yml@v2
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_pypi_assets.yml@v3
permissions:
contents: write
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
security-events: write
contents: read
actions: read
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-zizmor-advanced-security.yml@v2
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-zizmor-advanced-security.yml@v3

call-workflow-zizmor-advanced-security:
name: Zizmor analysis (annotate)
Expand All @@ -42,4 +42,4 @@ jobs:
checks: write
contents: read
actions: read
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-zizmor-annotate.yml@v2
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-zizmor-annotate.yml@v3
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ keywords = ["geophysics", "inverse problem"]
dependencies = [
"discretize>=0.11",
"geoana>=0.7.0",
"geoh5py>=0.12.0",
"geoh5py>=0.13.0b1",
"libdlf",
"matplotlib",
"numpy>=1.22",
Expand Down
16 changes: 11 additions & 5 deletions recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,26 @@ schema_version: 1

context:
name: "mira-simpeg"
# Read version from _version.txt file generated by setuptools_scm
version: ${{ load_from_file("_version.txt") | default("0.0.0.dev0") }}
python_min: "3.12"
# Read version from _version.txt file generated by setuptools_scm
version: "${{ load_from_file('_version.txt') | default('0.0.0.dev0') }}"
module_name: simpeg

package:
name: ${{ name|lower }}
version: ${{ version }}
version: "${{ version }}"

source:
path: ../simpeg

build:
number: 0
noarch: python
script: ${{ PYTHON }} -m pip install .[dask] -vv --no-deps
script:
env:
POETRY_DYNAMIC_VERSIONING_BYPASS: "${{ version }}"
content:
${{ PYTHON }} -m pip install .[dask] -vv --no-deps --no-build-isolation

requirements:
host:
Expand All @@ -28,7 +32,7 @@ requirements:
run:
- python >=${{ python_min }}
# Mira packages
- geoh5py >=0.13.0a2, 0.13.*
- geoh5py >=0.13.0b1, 0.13.*
# direct dependencies
- dask-core *
- discretize >=0.11
Expand All @@ -47,6 +51,7 @@ requirements:

tests:
- python:
python_version: ${{ python_min }}.*
imports:
- ${{ module_name }}
- ${{ module_name }}.electromagnetics
Expand Down Expand Up @@ -96,4 +101,5 @@ extra:
recipe-maintainers:
- andrewg-mira
- domfournier
- RomFloreani
- sebhmg
Loading