bump Poetry to v2.1.1 (#1534)

Author: jarosenb

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Fetch base and install Poetry
       run: |
         git fetch origin ${{github.base_ref}}
-        pipx install poetry
+        pipx install poetry==2.1.1
 
     - name: Setup Python
       uses: actions/setup-python@v4
@@ -31,7 +31,7 @@ jobs:
         cp --force designsafe/templates/base.j2 designsafe/templates/base.html
 
     - run: |
-        poetry install
+        poetry sync
 
     - name: Run Server-side unit tests and generate coverage report
       run: |
@@ -45,7 +45,7 @@ jobs:
     - name: Fetch base and install Poetry
       run: |
         git fetch origin ${{github.base_ref}}
-        pipx install poetry
+        pipx install poetry==2.1.1
 
     - name: Setup Python
       uses: actions/setup-python@v4
@@ -55,7 +55,7 @@ jobs:
 
     - name: Install Python Packages
       run:  |
-        poetry install
+        poetry sync
 
     - name: Run Server-side linting with pytest
       # Only run on new files for now-- for all changes, filter is ACMRTUXB

.gitignore

@@ -96,8 +96,8 @@ docs/_build/
 .docs/build
 target/
 venv/
+.venv/
 metrics/
-.python-version
 
 # ignore Google Drive API secrets
 *secrets.json

Makefile

@@ -12,6 +12,14 @@ build:
 build-dev:
 	docker compose -f ./conf/docker/docker-compose-dev.yml build
 
+.PHONY: python-install
+python-install:
+	pyenv local 3.11 && POETRY_VIRTUALENVS_IN_PROJECT=true poetry sync || echo \
+	'Command failed. Do you have Poetry (https://python-poetry.org/docs/#installation) \
+	and pyenv (https://github.com/pyenv/pyenv?tab=readme-ov-file#a-getting-pyenv) installed? \
+	You may also need to run "pyenv install 3.11".'
+
+
 .PHONY: start
 start:
 	docker compose --env-file $(NGROK_ENV_FILE) -f ./conf/docker/docker-compose-dev.all.debug.yml up

conf/docker/Dockerfile

@@ -34,49 +34,43 @@ ENV LC_ALL en_US.utf-8
 ENV LANG en_US.utf-8
 
 # https://python-poetry.org/docs/configuration/#using-environment-variables
-ENV POETRY_VERSION=1.8.2 \
-    POETRY_HOME="/opt/poetry" \
+ENV POETRY_VERSION=2.1.1 \
     POETRY_VIRTUALENVS_IN_PROJECT=true \
     PYSETUP_PATH="/opt/pysetup" \
-    VENV_PATH="/opt/pysetup/.venv"
+    VENV_PATH="/opt/pysetup/.venv" \
+    PIPX_ROOT_PATH="/root/.local/bin"
 
-# Prepend venv and poetry to path
-ENV PATH="$VENV_PATH/bin:$POETRY_HOME/bin:$PATH"
+# Install pipx and poetry
+RUN python3 -m pip install --user pipx && python3 -m pipx ensurepath
+ENV PATH="${PIPX_ROOT_PATH}:${VENV_PATH}/bin:$PATH"
+RUN pipx install poetry==2.1.1
 
 RUN groupadd --gid 816877 G-816877 && \
     useradd --uid 458981 --gid G-816877 -m --shell /bin/bash tg458981 -d /home/tg458981
 
-# Install poetry version $POETRY_VERSION to $POETRY_HOME
-RUN pip3 install --no-cache-dir --upgrade pip setuptools wheel \
-    && python3 -m venv "$POETRY_HOME" \
-    && "$POETRY_HOME/bin/pip" install --no-cache-dir poetry=="$POETRY_VERSION"
-
 # Copy project requirement files here to ensure they will be cached.
 WORKDIR $PYSETUP_PATH
-COPY poetry.lock pyproject.toml ./
+COPY pyproject.toml poetry.lock ./
 
 ##############
 # `development` image target is used for local development
 FROM python-base as development
 
-RUN "$POETRY_HOME/bin/poetry" install
+RUN poetry sync
 
 # Copy in base project directory without built client assets for local development
 COPY --chown=tg458981:G-816877 . /srv/www/designsafe
 
 USER tg458981
 
-# Install dev dependencies
-RUN "$POETRY_HOME/bin/poetry" install --with dev
-
 WORKDIR /srv/www/designsafe
 
 ##############
 # `production` image target is used for deployed runtime environments
 FROM python-base as production
 
 # Install runtime dependencies
-RUN "$POETRY_HOME/bin/poetry" install --without dev
+RUN poetry sync --without=dev
 
 # Copy in built client assets
 COPY --from=node_build --chown=tg458981:G-816877 /designsafe/ /srv/www/designsafe

conf/nginx/nginx.debug.conf

@@ -43,7 +43,8 @@ http {
     }
 
     server {
-        listen       443 ssl http2;
+        listen       443 ssl;
+        http2        on;
         server_name  designsafe.dev;
 
         charset utf-8;