From 01e4d77d2013909654b70a658dd290800f4423bf Mon Sep 17 00:00:00 2001
From: Josh Bailey <josh@vandervecken.com>
Date: Mon, 1 Apr 2024 07:20:49 +0000
Subject: [PATCH] poetry dev args.

---
 Dockerfile                  | 8 ++++----
 docker/Dockerfile.waterfall | 2 +-
 pyproject.toml              | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 67e44ce1..469c7b0c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ COPY bin/pipcacheconfig.sh /root/pipcacheconfig.sh
 COPY gamutrflib /gamutrflib/
 WORKDIR /gamutrflib
 RUN if [ "${POETRY_CACHE}" != "" ] ; then /root/pipcacheconfig.sh echo using cache "${POETRY_CACHE}" ; poetry source add --priority=default local "${POETRY_CACHE}" ; fi
-RUN poetry install --no-interaction --no-ansi --no-dev
+RUN poetry install --no-interaction --no-ansi --without dev
 WORKDIR /gamutrf
 RUN python3 -c "from gamutrflib.zmqbucket import *"
 COPY poetry.lock pyproject.toml README.md /gamutrf/
@@ -36,11 +36,11 @@ RUN if [ "${POETRY_CACHE}" != "" ] ; then echo using cache "${POETRY_CACHE}" ; p
 # TODO: handle caching
 RUN for i in bjoern falcon-cors gpsd-py3 RPi.GPIO pycairo ; do poetry run pip install --no-cache-dir "$i"=="$(grep $i pyproject.toml | grep -Eo '\"[0-9\.]+' | sed 's/\"//g')" || exit 1 ; done
 RUN if [ "$(arch)" == "aarch64" ] ; then poetry run pip install --no-cache-dir RPi.GPIO=="$(grep RPi.GPIO pyproject.toml | grep -Eo '\"[0-9\.]+' | sed 's/\"//g')" ; fi
-RUN poetry install --no-interaction --no-ansi --no-dev --no-root
+RUN poetry install --no-interaction --no-ansi --without dev --no-root
 COPY gamutrf gamutrf/
 COPY bin bin/
 COPY templates templates/
-RUN poetry install --no-interaction --no-ansi --no-dev
+RUN poetry install --no-interaction --no-ansi --without dev
 
 # nosemgrep:github.workflows.config.dockerfile-source-not-pinned
 FROM ubuntu:22.04
@@ -92,7 +92,7 @@ COPY --from=installer /gamutrflib /gamutrflib
 COPY --from=installer /root/.local /root/.local
 RUN ldconfig -v
 WORKDIR /gamutrflib
-RUN poetry install --no-interaction --no-ansi --no-dev
+RUN poetry install --no-interaction --no-ansi
 WORKDIR /gamutrf
 RUN python3 -c "from gamutrflib.zmqbucket import *"
 RUN echo "$(find /gamutrf/gamutrf -type f -name \*py -print)"|xargs grep -Eh "^(import|from)\s"|grep -Ev "gamutrf"|sort|uniq|python3
diff --git a/docker/Dockerfile.waterfall b/docker/Dockerfile.waterfall
index 546a2058..c8b72b56 100644
--- a/docker/Dockerfile.waterfall
+++ b/docker/Dockerfile.waterfall
@@ -37,7 +37,7 @@ COPY gamutrfwaterfall /gamutrfwaterfall/
 # TODO: handle caching for pycairo
 RUN poetry run pip install --no-cache-dir pycairo=="$(grep pycairo pyproject.toml | grep -Eo '[0-9\.]+')"
 RUN if [ "${POETRY_CACHE}" != "" ] ; then echo using cache "${POETRY_CACHE}" ; poetry source add --priority=default local "${POETRY_CACHE}" ; fi
-RUN poetry install --no-interaction --no-ansi --no-dev
+RUN poetry install --no-interaction --no-ansi --without dev
 
 FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/pyproject.toml b/pyproject.toml
index 7200c8b5..1802f1b7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,7 +51,6 @@ gamutrf-offline= 'gamutrf.__main__:offline'
 gamutrf-scan = 'gamutrf.__main__:scan'
 gamutrf-sigfinder = 'gamutrf.__main__:sigfinder'
 gamutrf-specgram = 'gamutrf.__main__:specgram'
-gamutrf-waterfall = 'gamutrf.__main__:waterfall'
 gamutrf-worker = 'gamutrf.__main__:worker'
 
 [tool.poetry.urls]