Skip to content

Commit 93408b3

Browse files
authored
Merge pull request #7 from JunAishima/standardize_workflows_dt1-1282
Standardize workflows dt1 1282
2 parents 9095db4 + d08d657 commit 93408b3

7 files changed

Lines changed: 1770 additions & 2285 deletions

File tree

.github/workflows/publish-ghcr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Create and publish a Docker image
44
# Configures this workflow to run every time a change is pushed to the branch called `release`.
55
on:
66
push:
7-
branches: ['main']
7+
branches: ["main"]
88

99
# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
1010
env:
@@ -49,7 +49,7 @@ jobs:
4949
push: true
5050
tags: ${{ steps.meta.outputs.tags }}
5151
labels: ${{ steps.meta.outputs.labels }}
52-
52+
5353
# This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see [Using artifact attestations to establish provenance for builds](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds).
5454
- name: Generate artifact attestation
5555
uses: actions/attest-build-provenance@v3

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ghcr.io/prefix-dev/pixi:latest
1+
FROM ghcr.io/prefix-dev/pixi:0.57.0
22

33
ENV TZ="America/New_York"
44

55
RUN apt-get -y update && \
6-
apt-get -y install git
6+
apt-get -y install git tzdata
77

88
COPY pixi.toml .
99
COPY pixi.lock .
@@ -14,7 +14,7 @@ RUN pixi shell-hook -s bash > /shell-hook
1414

1515
ENV PYTHONUNBUFFERED=1
1616

17-
COPY test.py .
17+
COPY default.py .
1818

1919
RUN mkdir /etc/tiled
2020
RUN mkdir /.prefect -m 0777
@@ -24,4 +24,4 @@ RUN /bin/bash /shell-hook
2424

2525
#now reapply deployment to push the image that is being created
2626
ENTRYPOINT ["pixi", "run"]
27-
CMD ["python", "-m", "test", "arg"]
27+
CMD ["python", "-m", "default", "arg"]

default.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
from __future__ import annotations
2+
3+
import prefect
4+
import subprocess
5+
import sys
6+
import tiled
7+
8+
9+
def print_argument(argument_to_print=""):
10+
if argument_to_print:
11+
print(f"argument to print: {argument_to_print}") # noqa: T201
12+
else:
13+
print("argument to print: EMPTY") # noqa: T201
14+
15+
16+
def info():
17+
print(f"Prefect info: {prefect.__version_info__}")
18+
print(f"Tiled info: {tiled.__version__}")
19+
output = subprocess.check_output(["pixi", "--version"])
20+
print(f"Pixi info: {output.decode().strip()}")
21+
22+
23+
if __name__ == "__main__":
24+
info()
25+
if len(sys.argv) > 1:
26+
print_argument(sys.argv[1])
27+
else:
28+
print_argument()

pixi.lock

Lines changed: 1730 additions & 2255 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ platforms = ["linux-64"]
55

66
[dependencies]
77
prefect = "3.*"
8-
python = "<3.13"
9-
tiled-client = ">=0.2.1"
8+
python = "<3.14"
9+
tiled = ">=0.2.3"
1010
prefect-docker = "*"
11-
databroker = "*"
12-
bluesky-tiled-plugins = "*"
13-
nexusformat = "*"
11+
bluesky-tiled-plugins = ">=2"
12+
nexusformat = "*"

prefect.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: prefect-docker-pixi-tiled-arpes
2-
prefect-version: 3.6.0
2+
prefect-version: 3.6.10
33

44
build: null
55

@@ -14,7 +14,7 @@ pull:
1414

1515
deployments:
1616
- name: arpes-end-of-run-workflow-docker
17-
version: 0.1.1
17+
version: 0.1.2
1818
tags:
1919
- arpes
2020
- esm

test.py

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

0 commit comments

Comments
 (0)