Skip to content

Commit

Permalink
fix: include deadline-cloud in the adaptor packaging script (#125)
Browse files Browse the repository at this point in the history
Signed-off-by: Trevor Blanchard <[email protected]>
  • Loading branch information
ttblanchard authored Mar 26, 2024
1 parent d3f9e1d commit fdd491d
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions scripts/create_adaptor_packaging_artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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


Expand Down

0 comments on commit fdd491d

Please sign in to comment.