Skip to content

Commit 63aa88a

Browse files
Merge branch 'main' into PhoebusGuiBuilderClass
2 parents a139bc1 + 8e56985 commit 63aa88a

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

.github/actions/install_requirements/action.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,17 @@ runs:
2323
python-version: ${{ inputs.python-version }}
2424

2525
- name: Install dependencies
26-
run: pdm sync -d --no-root
26+
run: pdm sync -d -G dev
2727
shell: bash
2828

2929
- name: Report what was installed
30-
run: pdm show
30+
run: pdm list
31+
shell: bash
32+
33+
- name: Add venv path to Github environment
34+
run: echo "VENV_PATH=$(pdm venv activate | sed 's/.*source //; s|/bin/activate||')" >> $GITHUB_ENV
35+
shell: bash
36+
37+
- name: Add venv path to Github Path
38+
run: echo "${{ env.VENV_PATH }}/bin:$PATH" >> $GITHUB_PATH
3139
shell: bash

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN pip install -U pdm
1717
# disable update check
1818
ENV PDM_CHECK_UPDATE=false
1919
# copy files
20-
COPY pyproject.toml pdm.lock README.md /project/
20+
COPY pyproject.toml pdm.lock README.md LICENSE /project/
2121
COPY src/ /project/src
2222

2323
# install dependencies and project into the local packages directory
@@ -27,7 +27,7 @@ RUN pdm install --check --prod --no-editable
2727
# The runtime stage copies the built venv into a slim runtime container
2828
FROM python:${PYTHON_VERSION}-slim AS runtime
2929
# Add apt-get system dependecies for runtime here if needed
30-
COPY --from=builder /project/.venv/ /project/.venv
30+
COPY --from=build /project/.venv/ /project/.venv
3131
ENV PATH="/project/.venv/bin:$PATH"
3232

3333
# change this entrypoint if it is not the same as the repo

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ optional-dependencies = { dev = [
3939
"types-mock",
4040
"types-pyyaml",
4141
] }
42-
scripts = { phoebus_guibuilder = "phoebus_guibuilder.__main__:main" }
42+
scripts = { phoebus-guibuilder = "phoebus_guibuilder.__main__:main" }
4343

4444
[build-system]
4545
requires = ["pdm-backend"]

src/phoebus_guibuilder/__main__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ def main(args: Sequence[str] | None = None) -> None:
2525
gb = Guibuilder(_args.filename)
2626
gb.extract_from_create_gui()
2727

28-
2928
if __name__ == "__main__":
3029
main()

0 commit comments

Comments
 (0)