Merge branch 'main' into main

api/Dockerfile

@@ -80,10 +80,9 @@ COPY --from=awf /usr/local/bin/audiowaveform /usr/local/bin
 
 # - Install system packages needed for running Python dependencies
 #   - libexempi8: required for watermarking
-#   - libpq-dev: required by `psycopg2`
 # - Create directory for dumping API logs
 RUN apt-get update \
-  && apt-get install -y curl libpq-dev libexempi8 postgresql-client \
+  && apt-get install -y curl libexempi8 postgresql-client \
   && rm -rf /var/lib/apt/lists/* \
   && mkdir -p /var/log/openverse_api/openverse_api.log
 

api/Pipfile

@@ -37,12 +37,12 @@ future = "~=0.18"
 gunicorn = "~=21.2"
 limit = "~=0.2"
 Pillow = "~=10.0.1"
-psycopg2 = "~=2.9"
 python-decouple = "~=3.8"
 python-xmp-toolkit = "~=2.0"
 sentry-sdk = "~=1.30"
 django-split-settings = "*"
 uvloop = "~=0.17"
+psycopg = "~=3.1"
 
 [requires]
 python_version = "3.11"