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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d069dcf
Requirements: revert upgrade to `psycopg==3.x`
humitos Sep 5, 2023
58e6cc1
Update packages
humitos Sep 12, 2023
661ae14
Merge branch 'main' of github.com:readthedocs/readthedocs.org into hu…
humitos Sep 12, 2023
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
18 changes: 4 additions & 14 deletions requirements/deploy.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ billiard==3.6.4.0
# via
# -r requirements/pip.txt
# celery
boto3==1.28.44
boto3==1.28.45
# via
# -r requirements/pip.txt
# django-storages
botocore==1.31.44
botocore==1.31.45
# via
# -r requirements/pip.txt
# boto3
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 Expand Up @@ -423,7 +413,7 @@ wcwidth==0.2.6
# via
# -r requirements/pip.txt
# prompt-toolkit
websocket-client==1.6.2
websocket-client==1.6.3
# via
# -r requirements/pip.txt
# docker
3 changes: 3 additions & 0 deletions requirements/docker.in
View file
Open in desktop
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
20 changes: 6 additions & 14 deletions requirements/docker.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ billiard==3.6.4.0
# via
# -r requirements/pip.txt
# celery
boto3==1.28.44
boto3==1.28.45
# via
# -r requirements/pip.txt
# django-storages
botocore==1.31.44
botocore==1.31.45
# via
# -r requirements/pip.txt
# boto3
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 Expand Up @@ -455,7 +447,7 @@ wcwidth==0.2.6
# via
# -r requirements/pip.txt
# prompt-toolkit
websocket-client==1.6.2
websocket-client==1.6.3
# via
# -r requirements/pip.txt
# docker
Expand Down
4 changes: 2 additions & 2 deletions requirements/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ markdown-it-py==3.0.0
# myst-parser
markupsafe==2.1.3
# via jinja2
matplotlib==3.7.2
matplotlib==3.7.3
# via sphinxext-opengraph
mdit-py-plugins==0.4.0
# via myst-parser
Expand All @@ -74,7 +74,7 @@ pygments==2.16.1
# sphinx
# sphinx-prompt
# sphinx-tabs
pyparsing==3.0.9
pyparsing==3.1.1
# via matplotlib
python-dateutil==2.8.2
# via matplotlib
Expand Down
5 changes: 3 additions & 2 deletions requirements/pip.in
View file
Open in desktop
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
14 changes: 4 additions & 10 deletions requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ async-timeout==4.0.3
# via redis
billiard==3.6.4.0
# via celery
boto3==1.28.44
boto3==1.28.45
# via django-storages
botocore==1.31.44
botocore==1.31.45
# via
# boto3
# s3transfer
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 Expand Up @@ -297,7 +291,7 @@ virtualenv==20.24.5
# via -r requirements/pip.in
wcwidth==0.2.6
# via prompt-toolkit
websocket-client==1.6.2
websocket-client==1.6.3
# via docker

# The following packages are considered to be unsafe in a requirements file:
Expand Down
18 changes: 4 additions & 14 deletions requirements/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ billiard==3.6.4.0
# via
# -r requirements/pip.txt
# celery
boto3==1.28.44
boto3==1.28.45
# via
# -r requirements/pip.txt
# django-storages
botocore==1.31.44
botocore==1.31.45
# via
# -r requirements/pip.txt
# boto3
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 Expand Up @@ -452,7 +442,7 @@ wcwidth==0.2.6
# via
# -r requirements/pip.txt
# prompt-toolkit
websocket-client==1.6.2
websocket-client==1.6.3
# via
# -r requirements/pip.txt
# docker
Expand Down