fix issues with QT_QPA_PLATFORM

DiamondLightSource · Feb 11, 2024 · a10d6a2 · a10d6a2
1 parent 09b2cf3
commit a10d6a2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 39 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
@@ -16,6 +16,8 @@ on:
 env:
  # https://github.com/pytest-dev/pytest/issues/2042
  PY_IGNORE_IMPORTMISMATCH: "1"
+ # allow tests to run headless
+ ENV QT_QPA_PLATFORM: offscreen
 
 jobs:
  run:

diff --git a/Dockerfile b/Dockerfile
@@ -13,8 +13,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN python -m venv /venv
 ENV PATH=/venv/bin:$PATH
 
-# allow tests to run headless in the dev container
-ENV QT_QPA_PLATFORM=offscreen
 ENV XDG_RUNTIME_DIR=/tmp/runtime-vscode
 
 # The build stage installs the context into the venv

diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ dev = [
 ]
 
 [project.scripts]
-dls-pmac-control = "dls_pmac_control.motor:main"
+dls-pmac-control = "dls_pmac_control.__main__:main"
 
 [project.urls]
 GitHub = "https://github.com/DiamondLightSource/dls-pmac-control"