Requirements: revert upgrade to psycopg==3.x

This package works fine and the upgrade was transparent. However, it seems that
New Relic agent is not prepared to collect data from v3.x and send it to their
servers.

https://docs.newrelic.com/docs/apm/agents/python-agent/getting-started/instrumented-python-packages/#instance-details

> The Python agent should be able to track database queries for any Python
> DB-API 2.0 compliant modules

`psycopg3` is compatible with DB-API 2.0, but for some reason doesn't work.
I'm reverting it for now and we can take a look later.

Note this commit also upgrades Django, due to a security issue that was
reported:

https://docs.djangoproject.com/en/4.2/releases/4.2.5/

Reverts #10667

Author: humitos

requirements/deploy.txt

@@ -96,7 +96,7 @@ dj-pagination==2.5.0
     # via -r requirements/pip.txt
 dj-stripe==2.6.3
     # via -r requirements/pip.txt
-django==4.2.4
+django==4.2.5
     # via
     #   -r requirements/pip.txt
     #   dj-stripe
@@ -265,16 +265,8 @@ prompt-toolkit==3.0.39
     #   -r requirements/pip.txt
     #   click-repl
     #   ipython
-psycopg[binary,pool]==3.1.10
+psycopg2==2.9.7
     # via -r requirements/pip.txt
-psycopg-binary==3.1.10
-    # via
-    #   -r requirements/pip.txt
-    #   psycopg
-psycopg-pool==3.1.7
-    # via
-    #   -r requirements/pip.txt
-    #   psycopg
 ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.2
@@ -385,8 +377,6 @@ typing-extensions==4.7.1
     #   -r requirements/pip.txt
     #   asgiref
     #   filelock
-    #   psycopg
-    #   psycopg-pool
 tzdata==2023.3
     # via
     #   -r requirements/pip.txt

requirements/docker.in

@@ -2,6 +2,9 @@
 
 -r pip.txt
 
+# https://www.psycopg.org/docs/install.html#psycopg-vs-psycopg-binary
+psycopg2-binary
+
 # run tests
 tox
 

requirements/docker.txt

@@ -105,7 +105,7 @@ dj-pagination==2.5.0
     # via -r requirements/pip.txt
 dj-stripe==2.6.3
     # via -r requirements/pip.txt
-django==4.2.4
+django==4.2.5
     # via
     #   -r requirements/pip.txt
     #   dj-stripe
@@ -288,16 +288,10 @@ prompt-toolkit==3.0.39
     #   -r requirements/pip.txt
     #   click-repl
     #   ipython
-psycopg[binary,pool]==3.1.10
+psycopg2==2.9.7
     # via -r requirements/pip.txt
-psycopg-binary==3.1.10
-    # via
-    #   -r requirements/pip.txt
-    #   psycopg
-psycopg-pool==3.1.7
-    # via
-    #   -r requirements/pip.txt
-    #   psycopg
+psycopg2-binary==2.9.7
+    # via -r requirements/docker.in
 ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.2
@@ -416,8 +410,6 @@ typing-extensions==4.7.1
     #   -r requirements/pip.txt
     #   asgiref
     #   filelock
-    #   psycopg
-    #   psycopg-pool
 tzdata==2023.3
     # via
     #   -r requirements/pip.txt

requirements/pip.in

@@ -7,8 +7,9 @@ django-extensions
 django-polymorphic
 django-autoslug
 
-# https://www.psycopg.org/psycopg3/docs/basic/install.html
-psycopg[binary,pool]
+# NOTE: we cannot use ``psycopg`` (3.x), even if it's supported by Django 4.2
+# because New Relic agent is not sending the data of the database to their servers.
+psycopg2
 
 # 3.1.0 includes changes that require running `makemigrations`
 # https://django-simple-history.readthedocs.io/en/latest/#changes

requirements/pip.txt

@@ -56,7 +56,7 @@ dj-pagination==2.5.0
     # via -r requirements/pip.in
 dj-stripe==2.6.3
     # via -r requirements/pip.in
-django==4.2.4
+django==4.2.5
     # via
     #   -r requirements/pip.in
     #   dj-stripe
@@ -185,12 +185,8 @@ platformdirs==3.10.0
     # via virtualenv
 prompt-toolkit==3.0.39
     # via click-repl
-psycopg[binary,pool]==3.1.10
+psycopg2==2.9.7
     # via -r requirements/pip.in
-psycopg-binary==3.1.10
-    # via psycopg
-psycopg-pool==3.1.7
-    # via psycopg
 pycparser==2.21
     # via cffi
 pygments==2.16.1
@@ -268,8 +264,6 @@ typing-extensions==4.7.1
     # via
     #   asgiref
     #   filelock
-    #   psycopg
-    #   psycopg-pool
 tzdata==2023.3
     # via
     #   -r requirements/pip.in

requirements/testing.txt

@@ -95,7 +95,7 @@ dj-pagination==2.5.0
     # via -r requirements/pip.txt
 dj-stripe==2.6.3
     # via -r requirements/pip.txt
-django==4.2.4
+django==4.2.5
     # via
     #   -r requirements/pip.txt
     #   dj-stripe
@@ -265,16 +265,8 @@ prompt-toolkit==3.0.39
     # via
     #   -r requirements/pip.txt
     #   click-repl
-psycopg[binary,pool]==3.1.10
+psycopg2==2.9.7
     # via -r requirements/pip.txt
-psycopg-binary==3.1.10
-    # via
-    #   -r requirements/pip.txt
-    #   psycopg
-psycopg-pool==3.1.7
-    # via
-    #   -r requirements/pip.txt
-    #   psycopg
 pycparser==2.21
     # via
     #   -r requirements/pip.txt
@@ -415,8 +407,6 @@ typing-extensions==4.7.1
     #   -r requirements/pip.txt
     #   asgiref
     #   filelock
-    #   psycopg
-    #   psycopg-pool
 tzdata==2023.3
     # via
     #   -r requirements/pip.txt