Skip to content

Requirements: revert upgrade to psycopg==3.x #10713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions requirements/deploy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions requirements/docker.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

-r pip.txt

# https://www.psycopg.org/docs/install.html#psycopg-vs-psycopg-binary
psycopg2-binary

# run tests
tox

Expand Down
16 changes: 4 additions & 12 deletions requirements/docker.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions requirements/pip.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -268,8 +264,6 @@ typing-extensions==4.7.1
# via
# asgiref
# filelock
# psycopg
# psycopg-pool
tzdata==2023.3
# via
# -r requirements/pip.in
Expand Down
14 changes: 2 additions & 12 deletions requirements/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down