hopefully finishpex moving and rearrange variables

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"

services/workflow/Dockerfile

 # 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

services/workflow/bin/install-pexes.sh

 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"},

services/workflow/pex-requirements.txt

+-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

services/workflow/requirements.txt

 -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

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"