diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b19b04322..b52d19fd3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -10,6 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ && apt-get install --yes \ apt-transport-https \ + build-essential \ ca-certificates \ curl \ debian-keyring \ @@ -44,17 +45,17 @@ RUN mkdir -p /etc/apt/keyrings \ # Install Angular CLI Globally RUN npm install -g @angular/cli -# Install Python 3.11 +# Install Python 3.12 RUN add-apt-repository ppa:deadsnakes/ppa \ && apt update \ && apt install --yes \ - python3.11 \ - python3-pip \ + python3.12 \ libpq-dev \ - python3.11-dev \ + python3.12-venv \ + python3.12-dev \ && rm -rf /var/lib/apt/lists* \ && unlink /usr/bin/python3 \ - && ln -s /usr/bin/python3.11 /usr/bin/python3 + && ln -s /usr/bin/python3.12 /usr/bin/python3 # Use a non-root user per https://code.visualstudio.com/remote/advancedcontainers/add-nonroot-user ARG USERNAME=vscode @@ -104,6 +105,7 @@ RUN arch="$(arch)"; \ # Install Database Dependencies COPY backend/requirements.txt /workspace/backend/requirements.txt WORKDIR /workspace/backend +RUN python3 -m ensurepip RUN python3 -m pip install -r requirements.txt diff --git a/Dockerfile b/Dockerfile index 20f80b92b..22d21c6c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ COPY ./frontend/*.json /workspace/frontend RUN ng build --optimization --output-path ../static # Back-end Build Steps -FROM python:3.11 +FROM python:3.12 RUN python3 -m pip install --upgrade pip COPY ./backend/requirements.txt /workspace/backend/requirements.txt RUN pip install --no-cache-dir --upgrade -r /workspace/backend/requirements.txt diff --git a/backend/requirements.txt b/backend/requirements.txt index 7b49973da..7c275f76a 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,12 +1,13 @@ -fastapi[all] >=0.110.0, <0.111.0 +fastapi[all] >=0.111.0, <0.112.0 honcho >=1.1.0, <1.2.0 -psycopg2 >=2.9.5, <2.10.0 -pyjwt >=2.6.0, <2.7.0 -pytest >=7.2.1, <7.3.0 -pytest-cov >=4.1.0, <4.2.0 -python-dotenv >=1.0.0, <1.1.0 -requests >=2.31.0, <2.32.0 -sqlalchemy >=2.0.4, <2.1.0 -alembic >=1.10.2, <1.11.0 -pygithub >=1.58.0, <1.59.0 -black >=23.10.1, <23.11.0 \ No newline at end of file +psycopg2 >=2.9.9, <2.10.0 +pyjwt >=2.8.0, <2.9.0 +pytest >=8.2.2, <8.3.0 +pytest-cov >=5.0.0, <5.1.0 +python-dotenv >=1.0.1, <1.1.0 +requests >=2.32.0, <2.33.0 +sqlalchemy >=2.0.30, <2.1.0 +alembic >=1.13.1, <1.14.0 +pygithub >=2.3.0, <2.4.0 +black >=24.4.2, <24.5.0 +setuptools >=70.0.0, <70.1.0 \ No newline at end of file