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
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM ghcr.io/prefix-dev/pixi:latest
FROM ghcr.io/prefix-dev/pixi:0.57.0

ENV TZ="America/New_York"

RUN apt-get -y update && \
apt-get -y install git
apt-get -y install git tzdata

COPY pixi.toml .
COPY pixi.lock .
Expand All @@ -14,7 +14,7 @@ RUN pixi shell-hook -s bash > /shell-hook

ENV PYTHONUNBUFFERED=1

COPY test.py .
COPY default.py .

RUN mkdir /etc/tiled
RUN mkdir /.prefect -m 0777
Expand All @@ -24,4 +24,4 @@ RUN /bin/bash /shell-hook

#now reapply deployment to push the image that is being created
ENTRYPOINT ["pixi", "run"]
CMD ["python", "-m", "test", "arg"]
CMD ["python", "-m", "default", "arg"]
28 changes: 28 additions & 0 deletions default.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
from __future__ import annotations

import prefect
import subprocess
import sys
import tiled


def print_argument(argument_to_print=""):
if argument_to_print:
print(f"argument to print: {argument_to_print}") # noqa: T201
else:
print("argument to print: EMPTY") # noqa: T201


def info():
print(f"Prefect info: {prefect.__version_info__}")
print(f"Tiled info: {tiled.__version__}")
output = subprocess.check_output(["pixi", "--version"])
print(f"Pixi info: {output.decode().strip()}")


if __name__ == "__main__":
info()
if len(sys.argv) > 1:
print_argument(sys.argv[1])
else:
print_argument()
2,913 changes: 369 additions & 2,544 deletions pixi.lock

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ platforms = ["linux-64", "osx-64", "osx-arm64"]

[dependencies]
prefect = ">=3.4.12"
tiled-client = ">0.1.b036"
python = "<3.13"
databroker = "*"
tiled-client = ">=0.2.3"
python = "<3.14"
bluesky-tiled-plugins = ">=2"
xraylib = "*"
scikit-beam = "*"
pre-commit = ">=4.3.0,<5"
databroker = "*"

[pypi-dependencies]
pyxrf = { git = "https://github.com/NSLS2/pyxrf.git", rev="7b7d868" }
4 changes: 2 additions & 2 deletions prefect.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: prefect-docker-pixi-tiled-srx
prefect-version: 3.6.0
prefect-version: 3.4.15

build: null

Expand All @@ -14,7 +14,7 @@ pull:

deployments:
- name: srx-end-of-run-workflow-docker
version: 0.1.1
version: 0.1.2
tags:
- srx
- main
Expand Down
24 changes: 0 additions & 24 deletions prefect_v2.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions test.py

This file was deleted.

Loading