Skip to content
This repository was archived by the owner on Aug 21, 2025. It is now read-only.

Commit 9974251

Browse files
authored
Merge branch 'develop' into pre-commit-ci-update-config
2 parents 976d13b + 786f766 commit 9974251

5 files changed

Lines changed: 269 additions & 256 deletions

File tree

.github/workflows/python_deploy_prod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ concurrency:
2626
jobs:
2727
call-workflow-conda-release:
2828
name: Publish production Conda package on JFrog Artifactory
29-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
3029
if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
30+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
3131
with:
32-
virtual-repo-names: '["public-conda-prod"]'
32+
virtual-repo-names: '["public-noremote-conda-prod"]'
3333
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
3434
secrets:
3535
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}

param_sweeps/driver.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ def update_lookup(self, lookup: dict, gather_first: bool = False):
153153
def write_files(self, lookup):
154154
"""Write ui.geoh5 and ui.json files for sweep trials."""
155155

156+
if self.params.worker_uijson is None:
157+
raise ValueError("Worker ui.json file path must be specified.")
158+
156159
ifile = InputFile.read_ui_json(self.params.worker_uijson)
157160
with ifile.data["geoh5"].open(mode="r") as workspace:
158161
for name, trial in lookup.items():
@@ -162,10 +165,10 @@ def write_files(self, lookup):
162165
iter_h5file = str(Path(workspace.h5file).parent / f"{name}.ui.geoh5")
163166
shutil.copy(workspace.h5file, iter_h5file)
164167

165-
ifile.data.update(
168+
ifile.update_ui_values(
166169
dict(
167170
{key: val for key, val in trial.items() if key != "status"},
168-
**{"geoh5": iter_h5file},
171+
**{"geoh5": Workspace(iter_h5file)},
169172
)
170173
)
171174

0 commit comments

Comments
 (0)