Merge branch 'main' into dependabot/pip/requests-2.31.0

mozilla-services · Oct 4, 2023 · 72424ec · 72424ec
2 parents cf796a3 + f7ab51e
commit 72424ec
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   db:
-    image: postgres:10-alpine
+    image: postgres:11-alpine
     volumes:
       - pgdata:/var/lib/postgresql/data
     ports:

diff --git a/docker/Dockerfile-pgbase b/docker/Dockerfile-pgbase
@@ -1,4 +1,4 @@
-FROM python:3.9.1-slim-buster
+FROM python:3.9.18-slim-buster
 # postgresql-client assumes a couple man directories are present, and the
 # installation will fail if they aren't.  We need to create these manually
 # because they are not created automatically in the 'slim' image.

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
 alabaster==0.7.12
 alembic==1.6.5
 amqp==5.0.6
-anyjson==0.3.3
 asn1crypto==1.4.0
 Beaker==1.11.0
 certifi==2020.12.5
@@ -24,7 +23,7 @@ Mako==1.1.4
 MarkupSafe==1.1.1
 MozillaPulse==1.3
 oic==0.9.1.0 # pyup: ignore
-psycopg2-binary==2.8.6
+psycopg2==2.9.9
 pycparser==2.20
 pycryptodomex==3.10.1
 pyjwkest==1.4.2
@@ -34,7 +33,7 @@ python-editor==1.0.4
 pytz==2021.1
 requests==2.31.0
 six==1.16.0
-urllib3==1.26.5
+urllib3==1.26.17
 SQLAlchemy==1.4.18
 vine==5.0.0
 Werkzeug==1.0.1
diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-python-3.9.1
+python-3.9.18