From fdd491dcadabf03edef9ed2e01ed9ad81b4f9227 Mon Sep 17 00:00:00 2001 From: ttblanchard <55503092+ttblanchard@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:36:13 -0500 Subject: [PATCH] fix: include deadline-cloud in the adaptor packaging script (#125) Signed-off-by: Trevor Blanchard --- scripts/create_adaptor_packaging_artifact.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/create_adaptor_packaging_artifact.sh b/scripts/create_adaptor_packaging_artifact.sh index 5199eea..ab712a1 100755 --- a/scripts/create_adaptor_packaging_artifact.sh +++ b/scripts/create_adaptor_packaging_artifact.sh @@ -68,6 +68,7 @@ mkdir -p $BINDIR if [ $SOURCE = 1 ]; then # In source mode, openjd-adaptor-runtime-for-python must be alongside this adaptor source RUNTIME_INSTALLABLE=$SCRIPTDIR/../../openjd-adaptor-runtime-for-python + CLIENT_INSTALLABLE=$SCRIPTDIR/../../deadline-cloud ADAPTOR_INSTALLABLE=$SCRIPTDIR/.. if [ "$CONDA_PLATFORM" = "win-64" ]; then @@ -93,16 +94,19 @@ if [ $SOURCE = 1 ]; then --ignore-installed \ --no-deps \ $RUNTIME_INSTALLABLE + + # Install these two at the same time otherwise they overwrite eachother pip install \ --target $PACKAGEDIR \ --platform $PYPI_PLATFORM \ --python-version $PYTHON_VERSION \ --ignore-installed \ --no-deps \ - $ADAPTOR_INSTALLABLE + $ADAPTOR_INSTALLABLE $CLIENT_INSTALLABLE else # In PyPI mode, PyPI and/or a CodeArtifact must have these packages RUNTIME_INSTALLABLE=openjd-adaptor-runtime-for-python + CLIENT_INSTALLABLE=deadline ADAPTOR_INSTALLABLE=$ADAPTOR_NAME pip install \ @@ -112,13 +116,15 @@ else --ignore-installed \ --only-binary=:all: \ $RUNTIME_INSTALLABLE + + # Install these two at the same time otherwise they overwrite eachother pip install \ --target $PACKAGEDIR \ --platform $PYPI_PLATFORM \ --python-version $PYTHON_VERSION \ --ignore-installed \ --no-deps \ - $ADAPTOR_INSTALLABLE + $ADAPTOR_INSTALLABLE $CLIENT_INSTALLABLE fi