diff --git a/Dockerfile b/Dockerfile index d1939616d..6af603ab0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,7 @@ RUN pip install -U pip COPY requirements.txt requirements.dev.txt manage.py ./ RUN pip install -U --no-cache-dir pip RUN pip install -r requirements.txt +RUN pip uninstall python-dotenv -y # Re-enable dev packages RUN python3 -m venv --system-site-packages dev-packages \ diff --git a/Dockerfile_EKS b/Dockerfile_EKS index b3b6dbb48..f3fbd8a1e 100644 --- a/Dockerfile_EKS +++ b/Dockerfile_EKS @@ -49,6 +49,7 @@ RUN pip install -U pip COPY requirements.txt requirements.dev.txt manage.py ./ RUN pip install -U --no-cache-dir pip RUN pip install -r requirements.txt +RUN pip uninstall python-dotenv -y # Re-enable dev packages RUN python3 -m venv --system-site-packages dev-packages \ diff --git a/requirements.dev.txt b/requirements.dev.txt index 56455c0a4..ae4b88722 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,7 +1,7 @@ -django-debug-toolbar>=2.2,<2.3 -django-debug-toolbar-requests>=1.0.5,<1.1 -django-elasticsearch-debug-toolbar>=2.0.0,<2.1 -pylint>=2.12.2,<2.13 -pylint-django>=2.4.4,<2.5 -ipython>=7.20.0,<7.21.0 -ipdb>=0.13.4,<0.14.0 \ No newline at end of file +django-debug-toolbar==3.2.4 +django-debug-toolbar-requests==1.0.5 +django-elasticsearch-debug-toolbar==2.0.0 +pylint==2.12.2 +pylint-django==2.4.4 +ipython==7.31.1 +ipdb==0.13.9 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 0be303e81..eb88dad87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -asgiref==3.2.10 +asgiref==3.5.0 auth0-python==3.13.0 boto3==1.20.13 channels==2.4.0 channels-redis==3.3.1 -Django>=3.1.1 +Django==3.1.14 django-crequest==2018.5.11 django-dotenv==1.4.2 django-extensions==3.1.5 @@ -16,8 +16,9 @@ django-structlog==2.2.0 djproxy==2.3.5 elasticsearch-dsl==7.2.1 gunicorn==20.0.4 -Jinja2>=2.11.2,<3.0 +Jinja2==2.11.3 kubernetes==11.0.0 +MarkupSafe==2.0.1 model-mommy==2.0.0 moto==1.3.14 mozilla-django-oidc==2.0.0 @@ -30,4 +31,4 @@ rules==3.0 sentry-sdk==1.5.1 slackclient==2.8.1 urllib3==1.26.5 -uvicorn==0.11.8 +uvicorn[standard]==0.17.5