diff --git a/apps/cli/utilities/wf_monitor/pyproject.toml b/apps/cli/utilities/wf_monitor/pyproject.toml index 24ed1ce5e4a64380d1d8dd64c86e94a88a5954b6..51e070963c00f96aec06cb2b46ee6e95a0c828ad 100644 --- a/apps/cli/utilities/wf_monitor/pyproject.toml +++ b/apps/cli/utilities/wf_monitor/pyproject.toml @@ -9,8 +9,8 @@ readme = "README.md" [tool.poetry.dependencies] python = "^3.10" pendulum = "^2.1.2" -workspaces = { path = "../../../../shared/workspaces" } -messaging = { path = "../../../../shared/messaging" } +workspaces = "2.8.2rc1" +messaging = "2.8.2rc1" [tool.poetry.scripts] wf_monitor = "wf_monitor.monitor:main" diff --git a/services/workflow/Dockerfile b/services/workflow/Dockerfile index b80a4da55e2b8da8244992abec1c7511de2177d6..40998653375fa9e82b68480c126a22ef5d6fc010 100644 --- a/services/workflow/Dockerfile +++ b/services/workflow/Dockerfile @@ -1,4 +1,5 @@ # This is nrao:workflow +ARG LOCAL_OR_SERVER_PEX=local-pex FROM python:3.10-slim-buster as base ARG WS_VERSION=unknown-version ARG DEPLOY_ENV=dev @@ -40,19 +41,17 @@ WORKDIR /packages/ COPY --chown=vlapipe:vlapipe ./shared ./shared COPY --chown=vlapipe:vlapipe ./apps/cli ./apps/cli ENV PATH "${PATH}:/home/vlapipe/.local/bin" -COPY --chown=vlapipe:vlapipe ./services/workflow/requirements.txt ./requirements.txt -RUN SETUPTOOLS_SCM_PRETEND_VERSION=${WS_VERSION} pip install --user -r requirements.txt +RUN pip install --upgrade pip FROM base as local-pex -COPY --chown=vlapipe:vlapipe ./services/workflow/pex-requirements.txt ./pex-requirements.txt -RUN SETUPTOOLS_SCM_PRETEND_VERSION=${WS_VERSION} pip install --user -r pex-requirements.txt +COPY --chown=vlapipe:vlapipe ./services/workflow/requirements.txt ./requirements.txt +RUN SETUPTOOLS_SCM_PRETEND_VERSION=${WS_VERSION} pip install --user -r requirements.txt FROM base as server-pex USER root COPY --chown=vlapipe:vlapipe ./services/workflow/bin/install-pexes.sh ./install-pexes.sh RUN . ./install-pexes.sh -ARG LOCAL_OR_SERVER_PEX=local-pex FROM ${LOCAL_OR_SERVER_PEX} as pex-base # HTCondor install USER root diff --git a/services/workflow/bin/install-pexes.sh b/services/workflow/bin/install-pexes.sh index a1de9ee97c324d7a8365f3e261238fd5ead447c6..29161a968961daeff91d48a142d0ada1144f7c71 100644 --- a/services/workflow/bin/install-pexes.sh +++ b/services/workflow/bin/install-pexes.sh @@ -1,4 +1,7 @@ pexes='[ + {"name":"messaging", "version":"2.8.2rc1"}, + {"name":"schema", "version":"2.8.2rc1"}, + {"name":"workspaces", "version":"2.8.2rc1"}, {"name":"carta_envoy", "version":"2.8.2rc1"}, {"name":"casa_envoy", "version":"2.8.2rc1"}, {"name":"conveyor", "version":"2.8.2rc1"}, diff --git a/services/workflow/pex-requirements.txt b/services/workflow/pex-requirements.txt index efe37ae9c2f6fe3eed2907171b2113015eb3efa7..1cd40f8757071679edf177656a7505dfb8df553c 100644 --- a/services/workflow/pex-requirements.txt +++ b/services/workflow/pex-requirements.txt @@ -1,3 +1,6 @@ +-e ../packages/shared/schema +-e ../packages/shared/messaging +-e ../packages/shared/workspaces -e ../packages/apps/cli/utilities/wf_monitor -e ../packages/apps/cli/utilities/aat_wrest -e ../packages/apps/cli/utilities/contacts_wrest diff --git a/services/workflow/requirements.txt b/services/workflow/requirements.txt index 8ae4e68fc18f530e5c2fa3991c4489fcd5d84fb7..d12fe59ce2cd5c8c9cae45ade8137c15d383cb8a 100644 --- a/services/workflow/requirements.txt +++ b/services/workflow/requirements.txt @@ -1,3 +1,13 @@ -e ../packages/shared/schema -e ../packages/shared/messaging -e ../packages/shared/workspaces +-e ../packages/apps/cli/utilities/wf_monitor +-e ../packages/apps/cli/utilities/aat_wrest +-e ../packages/apps/cli/utilities/contacts_wrest +-e ../packages/apps/cli/executables/pexable/mediator +-e ../packages/apps/cli/executables/pexable/productfetcher +-e ../packages/apps/cli/executables/pexable/deliver +-e ../packages/apps/cli/executables/pexable/null +-e ../packages/apps/cli/executables/pexable/casa_envoy +-e ../packages/apps/cli/executables/pexable/conveyor +-e ../packages/apps/cli/executables/pexable/ws_metrics \ No newline at end of file diff --git a/shared/messaging/pyproject.toml b/shared/messaging/pyproject.toml index c7fd9ee7ec520ebdda5e8023fde0936e07a1360c..c96e998e3aae8e9c71cfd4bdefcf89f4ba7142f8 100644 --- a/shared/messaging/pyproject.toml +++ b/shared/messaging/pyproject.toml @@ -11,7 +11,6 @@ python = "^3.10" kombu = "^5.2.4" pycapo = "^0.3.1" - [build-system] requires = ["poetry-core"] build-backend = "poetry.core.masonry.api"