From 684aa7ee3008eb4da4a5b8a206a4be01e0b9ea3e Mon Sep 17 00:00:00 2001
From: Alastair Porter <alastair.porter@upf.edu>
Date: Mon, 16 Oct 2023 18:03:55 +0200
Subject: [PATCH] Upgrade to python 3.12

---
 docker/Dockerfile.base        |  2 +-
 docker/Dockerfile.workers_web |  2 +-
 docker/Makefile               |  2 +-
 requirements.in               |  6 +++---
 requirements.txt              | 15 ++++-----------
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index 95a10f1f6..fbfc5395c 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -1,5 +1,5 @@
 ARG PYTHON
-FROM python:3.10
+FROM python:3.12
 
 LABEL org.opencontainers.image.authors="support@freesound.org"
 
diff --git a/docker/Dockerfile.workers_web b/docker/Dockerfile.workers_web
index 7ebe31af5..5477cda1d 100644
--- a/docker/Dockerfile.workers_web
+++ b/docker/Dockerfile.workers_web
@@ -11,7 +11,7 @@ RUN make clean && make
 
 # --- main Freesound docker file contents
 
-FROM freesound:2023-07
+FROM freesound:2023-10
 
 RUN mkdir -p /etc/apt/keyrings/
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
diff --git a/docker/Makefile b/docker/Makefile
index 1593c71c2..4813c128d 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,5 +1,5 @@
 all:
 	docker build -t freesound:2023-07-py2 -f Dockerfile.py2.base .
-	docker build -t freesound:2023-07 -f Dockerfile.base .
+	docker build -t freesound:2023-10 -f Dockerfile.base .
 
 .PHONY: all
diff --git a/requirements.in b/requirements.in
index 3551e7bea..d787d7a07 100644
--- a/requirements.in
+++ b/requirements.in
@@ -35,10 +35,10 @@ ipython==8.14.0
 mapbox==0.18.1
 markdown==3.4.1
 networkx==1.5
-numpy==1.24.3
-Pillow==9.5.0
+numpy==1.26.1
+Pillow==10.1.0
 pip-tools==7.1.0
-psycopg2-binary==2.9.6
+psycopg2-binary==2.9.9
 PyJWT==2.6.0
 pyparsing==2.4.7
 pysolr==3.10.0b1
diff --git a/requirements.txt b/requirements.txt
index 671647339..e989cf157 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile
@@ -189,7 +189,7 @@ msgpack==1.0.5
     # via cachecontrol
 networkx==1.5
     # via -r requirements.in
-numpy==1.24.3
+numpy==1.26.1
     # via
     #   -r requirements.in
     #   pysndfile
@@ -213,7 +213,7 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-pillow==9.5.0
+pillow==10.1.0
     # via -r requirements.in
 pip-tools==7.1.0
     # via -r requirements.in
@@ -223,7 +223,7 @@ prompt-toolkit==3.0.39
     # via
     #   click-repl
     #   ipython
-psycopg2-binary==2.9.6
+psycopg2-binary==2.9.9
     # via -r requirements.in
 ptyprocess==0.7.0
     # via pexpect
@@ -313,17 +313,10 @@ stripe==2.28.1
     # via -r requirements.in
 toml==0.10.2
     # via autopep8
-tomli==2.0.1
-    # via
-    #   build
-    #   pip-tools
-    #   pyproject-hooks
 traitlets==5.9.0
     # via
     #   ipython
     #   matplotlib-inline
-typing-extensions==4.7.1
-    # via asgiref
 tzdata==2023.3
     # via celery
 uritemplate==4.1.1