Skip to content
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

Dependencies: all packages updated via pip-tools #11650

Merged
merged 5 commits into from
Oct 8, 2024
Merged

Dependencies: all packages updated via pip-tools #11650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3898974
Dependencies: all packages updated via pip-tools
humitos Oct 6, 2024
1045f4c
Pin django-allauth
humitos Oct 7, 2024
0d81eb2
Docs: remove `display_version`
humitos Oct 7, 2024
574d015
Docs: ping Sphinx<8 and upgrade theme
humitos Oct 7, 2024
93ac112
Test: remove failing test
humitos Oct 7, 2024
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
1 change: 0 additions & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@
html_logo = "img/logo.svg"
html_theme_options = {
"logo_only": True,
"display_version": False,
}
html_context = {
# Fix the "edit on" links.
Expand Down
12 changes: 0 additions & 12 deletions readthedocs/proxito/tests/test_headers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,6 @@ def test_user_domain_headers(self):
self.assertEqual(r[http_header], http_header_value)
self.assertEqual(r[http_header_secure], http_header_value)

def test_hosting_integrations_header(self):
version = self.project.versions.get(slug=LATEST)
version.addons = True
version.save()

r = self.client.get(
"/en/latest/", secure=True, headers={"host": "project.dev.readthedocs.io"}
)
self.assertEqual(r.status_code, 200)
self.assertIsNotNone(r.get("X-RTD-Hosting-Integrations"))
self.assertEqual(r["X-RTD-Hosting-Integrations"], "true")

def test_force_addons_header(self):
fixture.get(AddonsConfig, project=self.project, enabled=True)

Expand Down
33 changes: 14 additions & 19 deletions requirements/deploy.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ billiard==3.6.4.0
# via
# -r requirements/pip.txt
# celery
boto3==1.35.24
boto3==1.35.34
# via
# -r requirements/pip.txt
# django-storages
botocore==1.35.24
botocore==1.35.34
# via
# -r requirements/pip.txt
# boto3
Expand Down Expand Up @@ -163,7 +163,7 @@ django-storages[boto3]==1.14.3
# via -r requirements/pip.txt
django-structlog==2.2.0
# via -r requirements/pip.txt
django-taggit==6.0.0
django-taggit==6.1.0
# via -r requirements/pip.txt
django-timezone-field==7.0
# via
Expand Down Expand Up @@ -224,7 +224,7 @@ idna==3.10
# via
# -r requirements/pip.txt
# requests
ipython==8.27.0
ipython==8.28.0
# via -r requirements/deploy.in
isodate==0.6.1
# via
Expand Down Expand Up @@ -263,7 +263,7 @@ markdown==3.7
# via -r requirements/pip.txt
matplotlib-inline==0.1.7
# via ipython
newrelic==9.13.0
newrelic==10.0.0
# via -r requirements/deploy.in
oauthlib==3.2.2
# via
Expand All @@ -286,14 +286,14 @@ platformdirs==4.3.6
# via
# -r requirements/pip.txt
# virtualenv
prompt-toolkit==3.0.47
prompt-toolkit==3.0.48
# via
# -r requirements/pip.txt
# click-repl
# ipython
psycopg[binary,pool]==3.2.2
psycopg[binary,pool]==3.2.3
# via -r requirements/pip.txt
psycopg-binary==3.2.2
psycopg-binary==3.2.3
# via
# -r requirements/pip.txt
# psycopg
Expand All @@ -317,10 +317,6 @@ pyjwt[crypto]==2.9.0
# via
# -r requirements/pip.txt
# django-allauth
pypng==0.20220715.0
# via
# -r requirements/pip.txt
# qrcode
pyquery==2.0.1
# via -r requirements/pip.txt
python-crontab==3.2.0
Expand All @@ -343,11 +339,11 @@ pytz==2024.2
# celery
pyyaml==6.0.2
# via -r requirements/pip.txt
qrcode==7.4.2
qrcode==8.0
# via
# -r requirements/pip.txt
# django-allauth
redis==5.0.8
redis==5.1.1
# via
# -r requirements/pip.txt
# django-cacheops
Expand Down Expand Up @@ -376,7 +372,7 @@ s3transfer==0.10.2
# boto3
selectolax==0.3.21
# via -r requirements/pip.txt
sentry-sdk==2.14.0
sentry-sdk==2.15.0
# via structlog-sentry
six==1.16.0
# via
Expand Down Expand Up @@ -411,7 +407,7 @@ toml==0.10.2
# via
# -r requirements/pip.txt
# bumpver
tomli==2.0.1
tomli==2.0.2
# via
# -r requirements/pip.txt
# dparse
Expand All @@ -427,8 +423,7 @@ typing-extensions==4.12.2
# ipython
# psycopg
# psycopg-pool
# qrcode
tzdata==2024.1
tzdata==2024.2
# via
# -r requirements/pip.txt
# django-celery-beat
Expand Down Expand Up @@ -459,7 +454,7 @@ vine==5.1.0
# amqp
# celery
# kombu
virtualenv==20.26.5
virtualenv==20.26.6
# via -r requirements/pip.txt
wcwidth==0.2.13
# via
Expand Down
35 changes: 16 additions & 19 deletions requirements/docker.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ billiard==3.6.4.0
# via
# -r requirements/pip.txt
# celery
boto3==1.35.24
boto3==1.35.34
# via
# -r requirements/pip.txt
# django-storages
botocore==1.35.24
botocore==1.35.34
# via
# -r requirements/pip.txt
# boto3
Expand Down Expand Up @@ -173,7 +173,7 @@ django-storages[boto3]==1.14.3
# via -r requirements/pip.txt
django-structlog==2.2.0
# via -r requirements/pip.txt
django-taggit==6.0.0
django-taggit==6.1.0
# via -r requirements/pip.txt
django-timezone-field==7.0
# via
Expand Down Expand Up @@ -239,7 +239,7 @@ idna==3.10
# requests
ipdb==0.13.13
# via -r requirements/docker.in
ipython==8.27.0
ipython==8.28.0
# via ipdb
isodate==0.6.1
# via
Expand Down Expand Up @@ -310,14 +310,14 @@ platformdirs==4.3.6
# virtualenv
pluggy==1.5.0
# via tox
prompt-toolkit==3.0.47
prompt-toolkit==3.0.48
# via
# -r requirements/pip.txt
# click-repl
# ipython
psycopg[binary,pool]==3.2.2
psycopg[binary,pool]==3.2.3
# via -r requirements/pip.txt
psycopg-binary==3.2.2
psycopg-binary==3.2.3
# via
# -r requirements/pip.txt
# psycopg
Expand All @@ -343,10 +343,6 @@ pyjwt[crypto]==2.9.0
# via
# -r requirements/pip.txt
# django-allauth
pypng==0.20220715.0
# via
# -r requirements/pip.txt
# qrcode
pyproject-api==1.8.0
# via tox
pyquery==2.0.1
Expand All @@ -373,11 +369,11 @@ pytz==2024.2
# celery
pyyaml==6.0.2
# via -r requirements/pip.txt
qrcode==7.4.2
qrcode==8.0
# via
# -r requirements/pip.txt
# django-allauth
redis==5.0.8
redis==5.1.1
# via
# -r requirements/pip.txt
# django-cacheops
Expand All @@ -400,7 +396,7 @@ requests-toolbelt==1.0.0
# via -r requirements/pip.txt
rest-framework-generic-relations==2.2.0
# via -r requirements/pip.txt
rich==13.8.1
rich==13.9.2
# via -r requirements/docker.in
s3transfer==0.10.2
# via
Expand Down Expand Up @@ -438,14 +434,14 @@ toml==0.10.2
# via
# -r requirements/pip.txt
# bumpver
tomli==2.0.1
tomli==2.0.2
# via
# -r requirements/pip.txt
# dparse
# ipdb
# pyproject-api
# tox
tox==4.20.0
tox==4.21.2
# via -r requirements/docker.in
traitlets==5.14.3
# via
Expand All @@ -459,8 +455,9 @@ typing-extensions==4.12.2
# ipython
# psycopg
# psycopg-pool
# qrcode
tzdata==2024.1
# rich
# tox
tzdata==2024.2
# via
# -r requirements/pip.txt
# django-celery-beat
Expand Down Expand Up @@ -490,7 +487,7 @@ vine==5.1.0
# amqp
# celery
# kombu
virtualenv==20.26.5
virtualenv==20.26.6
# via
# -r requirements/pip.txt
# tox
Expand Down
6 changes: 4 additions & 2 deletions requirements/docs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# Packages required to build docs, independent of application dependencies

sphinx
# There is an error when copying assets
# TypeError: unsupported operand type(s) for /: 'str' and 'str'
sphinx<8

matplotlib # opengraph social cards

sphinx_rtd_theme==3.0.0rc4
sphinx_rtd_theme
sphinx-tabs
sphinx-intl
sphinx-design
Expand Down
16 changes: 8 additions & 8 deletions requirements/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ contourpy==1.3.0
# via matplotlib
cycler==0.12.1
# via matplotlib
docutils==0.20.1
docutils==0.21.2
# via
# myst-parser
# sphinx
Expand All @@ -37,7 +37,7 @@ docutils==0.20.1
# sphinx-tabs
exceptiongroup==1.2.2
# via anyio
fonttools==4.53.1
fonttools==4.54.1
# via matplotlib
h11==0.14.0
# via uvicorn
Expand Down Expand Up @@ -67,7 +67,7 @@ mdurl==0.1.2
# via markdown-it-py
myst-parser==4.0.0
# via -r requirements/docs.in
numpy==2.1.1
numpy==2.1.2
# via
# contourpy
# matplotlib
Expand Down Expand Up @@ -117,7 +117,7 @@ sphinx==7.4.7
# sphinxcontrib-jquery
# sphinxemoji
# sphinxext-opengraph
sphinx-autobuild==2024.9.19
sphinx-autobuild==2024.10.3
# via -r requirements/docs.in
sphinx-copybutton==0.5.2
# via -r requirements/docs.in
Expand All @@ -133,7 +133,7 @@ sphinx-notfound-page==1.0.4
# via -r requirements/docs.in
sphinx-prompt==1.8.0
# via -r requirements/docs.in
sphinx-rtd-theme==3.0.0rc4
sphinx-rtd-theme==3.0.0
# via -r requirements/docs.in
sphinx-tabs==3.4.5
# via -r requirements/docs.in
Expand Down Expand Up @@ -161,17 +161,17 @@ sphinxemoji==0.3.1
# via -r requirements/docs.in
sphinxext-opengraph==0.9.1
# via -r requirements/docs.in
starlette==0.38.5
starlette==0.39.2
# via sphinx-autobuild
tomli==2.0.1
tomli==2.0.2
# via sphinx
typing-extensions==4.12.2
# via
# anyio
# uvicorn
urllib3==2.2.3
# via requests
uvicorn==0.30.6
uvicorn==0.31.0
# via sphinx-autobuild
watchfiles==0.24.0
# via sphinx-autobuild
Expand Down
4 changes: 3 additions & 1 deletion requirements/pip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ django-celery-beat
# TODO: remove this dependency once we upgrade Celery. It should auto-install it.
tzdata

django-allauth[socialaccount,saml,mfa]
# We need to update some 2FA templates to update to 65+
# https://github.com/readthedocs/ext-theme/issues/501
django-allauth[socialaccount,saml,mfa]<65

requests-oauthlib

Expand Down
Loading