update poetry commands to not create virtualenv and add additional optimization flags

Author: taddes

.circleci/config.yml

@@ -43,7 +43,8 @@ commands:
             pip3 install flake8 hawkauthlib konfig pyramid pyramid_hawkauth requests simplejson unittest2 WebTest WSGIProxy2 poetry
             # NOTE: Python3.12 requires `--break-system-packages`.
             # This command is run on the cimg/rust image, which is running python 3.10
-            poetry install
+            # pip3 install -r requirements.txt
+            poetry install --without dev --with tokenserver-unit-tests --no-interaction --no-ansi
   rust-check:
     steps:
       - run:

Dockerfile

@@ -21,7 +21,6 @@ FROM chef AS cacher
 ARG DATABASE_BACKEND
 ARG MYSQLCLIENT_PKG
 
-
 # cmake is required to build grpcio-sys for Spanner builds
 RUN \
     if [ "$MYSQLCLIENT_PKG" = libmysqlclient-dev ] ; then \
@@ -55,14 +54,11 @@ RUN \
     fi && \
     apt-get -q update && \
     apt-get -q install -y --no-install-recommends $MYSQLCLIENT_PKG cmake golang-go python3-dev python3-pip python3-setuptools python3-wheel pkg-config && \
+    curl -sSL https://install.python-poetry.org | python3 - && \
+    ln -s /root/.local/bin/poetry /usr/local/bin/poetry && \
+    pip3 install -r requirements.txt && \
     rm -rf /var/lib/apt/lists/*
 
-RUN curl -sSL https://install.python-poetry.org | python3 -
-WORKDIR /app
-ADD ./poetry.lock /app
-ADD ./pyproject.toml /app
-RUN python3 --version
-RUN poetry install --without dev
 
 
 ENV PATH=$PATH:/root/.cargo/bin
@@ -76,6 +72,7 @@ FROM docker.io/library/debian:bullseye-slim
 ARG MYSQLCLIENT_PKG
 
 WORKDIR /app
+COPY --from=builder /app/requirements.txt /app
 COPY --from=builder /app/pyproject.toml /app/poetry.lock /app/
 
 RUN \
@@ -101,8 +98,7 @@ RUN \
     apt-get -q remove -y python3-cryptography && \
     curl -sSL https://install.python-poetry.org | python3 - && \
     ln -s /root/.local/bin/poetry /usr/local/bin/poetry && \
-    poetry config virtualenvs.create false && \
-    poetry install --without dev --no-root && \
+    pip3 install -r /app/requirements.txt && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /app/bin /app/bin
@@ -115,11 +111,8 @@ COPY --from=builder /app/scripts/start_mock_fxa_server.sh /app/scripts/start_moc
 COPY --from=builder /app/syncstorage-spanner/src/schema.ddl /app/schema.ddl
 
 RUN chmod +x /app/scripts/prepare-spanner.sh
-WORKDIR /app/tools/integration_tests/
-RUN python3 --version
-RUN poetry install --without dev --no-root
-WORKDIR /app/tools/tokenserver/
-RUN poetry install --without dev --no-root
+RUN pip3 install -r /app/tools/integration_tests/requirements.txt
+RUN pip3 install -r /app/tools/tokenserver/requirements.txt
 
 USER app:app
 

poetry.lock

@@ -17,6 +17,24 @@ cryptography = "^44.0.2"
 pyfxa = "^0.8.1"
 tokenlib = "^2.0.0"
 
+[tool.poetry.group.tokenserver-unit-tests.dependencies]
+cryptography = "44.0.2"
+hawkauthlib = "^2.0.0"
+konfig = "^1.1"
+mysqlclient = "^2.2.7"
+psutil = "^7.0.0"
+pyjwt = "^2.10.1"
+pyramid = "^2.0.2"
+pyramid-hawkauth = "^2.0.0"
+pyfxa = "0.8.1"
+pytest = "^8.4.0"
+requests = "^2.32.4"
+simplejson = "^3.20.1"
+sqlalchemy = "1.4.46"
+tokenlib = "^2.0.0"
+webtest = "^3.0.6"
+wsgiproxy2 = "^0.5.1"
+
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.16.0"
 pydocstyle = "^6.3.0"

pyproject.toml

@@ -1,4 +1,3 @@
 #!/bin/sh
 
-python3 /app/tools/integration_tests/tokenserver/mock_fxa_server.py
-
+python3 /app/tools/integration_tests/tokenserver/mock_fxa_server.py

scripts/start_mock_fxa_server.sh

@@ -18,7 +18,8 @@ WORKDIR /app/
 COPY purge_ttl.py count_expired_rows.py count_users.py poetry.lock pyproject.toml /app/
 RUN python3 --version
 
-RUN poetry install --without dev --no-interaction --no-ansi
+RUN poetry config virtualenvs.create false && \
+    poetry install --without dev --no-interaction --no-ansi
 
 USER nobody