Skip to content

Commit

Permalink
this almost works, need to put conda url in pixi.toml compile
Browse files Browse the repository at this point in the history
  • Loading branch information
cisaacstern committed Nov 23, 2024
1 parent 6ad9ffe commit 8dcfb61
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 7 deletions.
4 changes: 2 additions & 2 deletions dev/check-all-recompiled.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ def main(spec_path_str: str, artifacts_dir: str) -> None:
artifacts_dir=artifacts_dir,
)

expected = Fingerprint(spec=spec, artifacts=wa_from_spec)
actual_on_disk = Fingerprint(spec=spec, artifacts=wa_from_disk)
expected = Fingerprint(spec=spec, wa=wa_from_spec)
actual_on_disk = Fingerprint(spec=spec, wa=wa_from_disk)

assert set([r.model_dump_json() for r in expected.installed_requirements]) == set(
[r.model_dump_json() for r in actual_on_disk.installed_requirements]
Expand Down
5 changes: 5 additions & 0 deletions examples/events/ecoscope-workflows-events-workflow/pixi.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 19 additions & 5 deletions src/ecoscope-workflows-core/ecoscope_workflows_core/artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,32 @@ def from_disk(
**{
f.name: f.read_text()
for f in artifacts_dir.joinpath(package_name).iterdir()
}
if f.is_file() and not f.name == "rjsf.json"
},
**{
"rjsf.json": json.load(
artifacts_dir.joinpath(package_name, "rjsf.json").open()
)
},
dags=Dags(
**{
f.name: f.read_text()
for f in artifacts_dir.joinpath(package_name, "dags").iterdir()
}
),
)
return WorkflowArtifacts(
spec_relpath=spec_relpath,
release_name=artifacts_dir.name,
package_name=package_name,
package=package,
tests=tests,
pixi_toml=pixi_toml,
dockerfile=dockerfile,
dockerignore=dockerignore,
readme_md=readme_md,
**{
"pixi.toml": pixi_toml,
"Dockerfile": dockerfile,
".dockerignore": dockerignore,
"README.md": readme_md,
},
)

def dump(self, clobber: bool = False, update: bool = False):
Expand Down

0 comments on commit 8dcfb61

Please sign in to comment.