From 7dcd6548440228dbe44b1fd1e74795885fb751c7 Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Fri, 12 Jul 2024 11:03:00 -0400 Subject: [PATCH] fix(docker): troute.nwm build Fix how `troute.nwm` is built. https://github.com/NOAA-OWP/t-route/pull/784 removed `setup.py`, as a result the package should now be built with `build`. --- docker/main/ngen/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/main/ngen/Dockerfile b/docker/main/ngen/Dockerfile index 8fd605e13..6bedbd2f6 100644 --- a/docker/main/ngen/Dockerfile +++ b/docker/main/ngen/Dockerfile @@ -507,7 +507,8 @@ RUN if [ "${NGEN_WITH_ROUTING}" == "ON" ]; then \ && python3 -m build . \ && cp dist/*.whl ${WORKDIR}/t-route/wheels/ \ && cd ${WORKDIR}/t-route/src/troute-nwm \ - && python3 setup.py bdist_wheel \ + # troute-nwm doesn't use setup.py ... use build to make the wheel; see https://github.com/NOAA-OWP/t-route/pull/784 \ + && python3 -m build . \ && cp dist/*.whl ${WORKDIR}/t-route/wheels/ ; \ fi @@ -932,4 +933,4 @@ USER root RUN pip install --no-cache-dir "git+https://github.com/noaa-owp/ngen-cal@${NGEN_CAL_COMMIT:-${NGEN_CAL_BRANCH}}#egg=ngen_cal&subdirectory=python/ngen_cal" USER ${USER} -RUN chmod +x ${WORKDIR}/entrypoint.sh \ No newline at end of file +RUN chmod +x ${WORKDIR}/entrypoint.sh