From 38989743d0db86a7ed0c2a8a272203498de1c6ca Mon Sep 17 00:00:00 2001 From: humitos <244656+humitos@users.noreply.github.com> Date: Sun, 6 Oct 2024 00:08:36 +0000 Subject: [PATCH 1/5] Dependencies: all packages updated via pip-tools --- requirements/deploy.txt | 35 +++++++++++++++-------------------- requirements/docker.txt | 37 +++++++++++++++++-------------------- requirements/docs.txt | 29 +++++++++++++++++------------ requirements/pip.txt | 27 ++++++++++++--------------- requirements/testing.txt | 29 ++++++++++++----------------- 5 files changed, 73 insertions(+), 84 deletions(-) diff --git a/requirements/deploy.txt b/requirements/deploy.txt index 36c33b80c96..e4f1ad8d8e7 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -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 @@ -121,7 +121,7 @@ django==4.2.16 # django-timezone-field # djangorestframework # jsonfield -django-allauth[mfa,saml,socialaccount]==64.2.1 +django-allauth[mfa,saml,socialaccount]==65.0.2 # via -r requirements/pip.txt django-annoying==0.10.7 # via -r requirements/pip.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/docker.txt b/requirements/docker.txt index c161d5ad12c..a56af7c877b 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -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 @@ -131,7 +131,7 @@ django==4.2.16 # django-timezone-field # djangorestframework # jsonfield -django-allauth[mfa,saml,socialaccount]==64.2.1 +django-allauth[mfa,saml,socialaccount]==65.0.2 # via -r requirements/pip.txt django-annoying==0.10.7 # via -r requirements/pip.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/docs.txt b/requirements/docs.txt index 69fbe05d356..434ceb84887 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/docs.txt requirements/docs.in # -alabaster==0.7.16 +alabaster==1.0.0 # via sphinx anyio==4.6.0 # via @@ -15,7 +15,9 @@ babel==2.16.0 # sphinx # sphinx-intl certifi==2024.8.30 - # via requests + # via + # requests + # sphinx-prompt charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -28,7 +30,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 @@ -37,7 +39,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 @@ -45,6 +47,7 @@ idna==3.10 # via # anyio # requests + # sphinx-prompt imagesize==1.4.1 # via sphinx jinja2==3.1.4 @@ -67,7 +70,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 @@ -100,7 +103,7 @@ sniffio==1.3.1 # via anyio snowballstemmer==2.2.0 # via sphinx -sphinx==7.4.7 +sphinx==8.0.2 # via # -r requirements/docs.in # myst-parser @@ -117,7 +120,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 @@ -131,7 +134,7 @@ sphinx-multiproject==1.0.0rc1 # via -r requirements/docs.in sphinx-notfound-page==1.0.4 # via -r requirements/docs.in -sphinx-prompt==1.8.0 +sphinx-prompt==1.9.0 # via -r requirements/docs.in sphinx-rtd-theme==3.0.0rc4 # via -r requirements/docs.in @@ -161,17 +164,19 @@ 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 + # via + # requests + # sphinx-prompt +uvicorn==0.31.0 # via sphinx-autobuild watchfiles==0.24.0 # via sphinx-autobuild diff --git a/requirements/pip.txt b/requirements/pip.txt index 359caf7eab6..5dc97e1b210 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -14,9 +14,9 @@ async-timeout==4.0.3 # via redis billiard==3.6.4.0 # via celery -boto3==1.35.24 +boto3==1.35.34 # via django-storages -botocore==1.35.24 +botocore==1.35.34 # via # boto3 # s3transfer @@ -85,7 +85,7 @@ django==4.2.16 # django-timezone-field # djangorestframework # jsonfield -django-allauth[mfa,saml,socialaccount]==64.2.1 +django-allauth[mfa,saml,socialaccount]==65.0.2 # via -r requirements/pip.in django-annoying==0.10.7 # via -r requirements/pip.in @@ -127,7 +127,7 @@ django-storages[boto3]==1.14.3 # via -r requirements/pip.in django-structlog==2.2.0 # via -r requirements/pip.in -django-taggit==6.0.0 +django-taggit==6.1.0 # via -r requirements/pip.in django-timezone-field==7.0 # via django-celery-beat @@ -208,11 +208,11 @@ packaging==24.1 # gunicorn platformdirs==4.3.6 # via virtualenv -prompt-toolkit==3.0.47 +prompt-toolkit==3.0.48 # via click-repl -psycopg[binary,pool]==3.2.2 +psycopg[binary,pool]==3.2.3 # via -r requirements/pip.in -psycopg-binary==3.2.2 +psycopg-binary==3.2.3 # via psycopg psycopg-pool==3.2.3 # via psycopg @@ -222,8 +222,6 @@ pygments==2.18.0 # via -r requirements/pip.in pyjwt[crypto]==2.9.0 # via django-allauth -pypng==0.20220715.0 - # via qrcode pyquery==2.0.1 # via -r requirements/pip.in python-crontab==3.2.0 @@ -242,9 +240,9 @@ pytz==2024.2 # celery pyyaml==6.0.2 # via -r requirements/pip.in -qrcode==7.4.2 +qrcode==8.0 # via django-allauth -redis==5.0.8 +redis==5.1.1 # via # -r requirements/pip.in # django-cacheops @@ -294,7 +292,7 @@ structlog==23.2.0 # django-structlog toml==0.10.2 # via bumpver -tomli==2.0.1 +tomli==2.0.2 # via dparse typing-extensions==4.12.2 # via @@ -302,8 +300,7 @@ typing-extensions==4.12.2 # elasticsearch-dsl # psycopg # psycopg-pool - # qrcode -tzdata==2024.1 +tzdata==2024.2 # via # -r requirements/pip.in # django-celery-beat @@ -327,7 +324,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.26.5 +virtualenv==20.26.6 # via -r requirements/pip.in wcwidth==0.2.13 # via prompt-toolkit diff --git a/requirements/testing.txt b/requirements/testing.txt index 9bc593dadae..7031889110f 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -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 @@ -126,7 +126,7 @@ django==4.2.16 # django-timezone-field # djangorestframework # jsonfield -django-allauth[mfa,saml,socialaccount]==64.2.1 +django-allauth[mfa,saml,socialaccount]==65.0.2 # via -r requirements/pip.txt django-annoying==0.10.7 # via -r requirements/pip.txt @@ -170,7 +170,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 @@ -293,13 +293,13 @@ platformdirs==4.3.6 # virtualenv pluggy==1.5.0 # via pytest -prompt-toolkit==3.0.47 +prompt-toolkit==3.0.48 # via # -r requirements/pip.txt # click-repl -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 @@ -319,10 +319,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 pytest==8.3.3 @@ -363,11 +359,11 @@ pyyaml==6.0.2 # via # -r requirements/pip.txt # yamale -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 @@ -443,7 +439,7 @@ toml==0.10.2 # via # -r requirements/pip.txt # bumpver -tomli==2.0.1 +tomli==2.0.2 # via # -r requirements/pip.txt # coverage @@ -457,9 +453,8 @@ typing-extensions==4.12.2 # elasticsearch-dsl # psycopg # psycopg-pool - # qrcode # sphinx -tzdata==2024.1 +tzdata==2024.2 # via # -r requirements/pip.txt # django-celery-beat @@ -489,7 +484,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 From 1045f4c9b2a727643309fc986b317944b7c035cd Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 7 Oct 2024 10:40:31 +0200 Subject: [PATCH 2/5] Pin django-allauth --- requirements/deploy.txt | 2 +- requirements/docker.txt | 2 +- requirements/pip.in | 4 +++- requirements/pip.txt | 2 +- requirements/testing.txt | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/requirements/deploy.txt b/requirements/deploy.txt index e4f1ad8d8e7..a6e7b361f1e 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -121,7 +121,7 @@ django==4.2.16 # django-timezone-field # djangorestframework # jsonfield -django-allauth[mfa,saml,socialaccount]==65.0.2 +django-allauth[mfa,saml,socialaccount]==64.2.1 # via -r requirements/pip.txt django-annoying==0.10.7 # via -r requirements/pip.txt diff --git a/requirements/docker.txt b/requirements/docker.txt index a56af7c877b..e7cfb4aa114 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -131,7 +131,7 @@ django==4.2.16 # django-timezone-field # djangorestframework # jsonfield -django-allauth[mfa,saml,socialaccount]==65.0.2 +django-allauth[mfa,saml,socialaccount]==64.2.1 # via -r requirements/pip.txt django-annoying==0.10.7 # via -r requirements/pip.txt diff --git a/requirements/pip.in b/requirements/pip.in index dc637d8b8d0..651b8322593 100644 --- a/requirements/pip.in +++ b/requirements/pip.in @@ -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 diff --git a/requirements/pip.txt b/requirements/pip.txt index 5dc97e1b210..6ca528a3e1c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -85,7 +85,7 @@ django==4.2.16 # django-timezone-field # djangorestframework # jsonfield -django-allauth[mfa,saml,socialaccount]==65.0.2 +django-allauth[mfa,saml,socialaccount]==64.2.1 # via -r requirements/pip.in django-annoying==0.10.7 # via -r requirements/pip.in diff --git a/requirements/testing.txt b/requirements/testing.txt index 7031889110f..9f1c37d0cab 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -126,7 +126,7 @@ django==4.2.16 # django-timezone-field # djangorestframework # jsonfield -django-allauth[mfa,saml,socialaccount]==65.0.2 +django-allauth[mfa,saml,socialaccount]==64.2.1 # via -r requirements/pip.txt django-annoying==0.10.7 # via -r requirements/pip.txt From 0d81eb263327c2ecc79d623f09d707cf4b1d5a41 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 7 Oct 2024 10:46:29 +0200 Subject: [PATCH 3/5] Docs: remove `display_version` --- docs/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 5c44b2422ad..f13c6c0f70e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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. From 574d0150b23bd06917912550ed556351370b911c Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 7 Oct 2024 10:59:45 +0200 Subject: [PATCH 4/5] Docs: ping Sphinx<8 and upgrade theme --- requirements/docs.in | 6 ++++-- requirements/docs.txt | 17 ++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/requirements/docs.in b/requirements/docs.in index b28361e5623..3960191d27d 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -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 diff --git a/requirements/docs.txt b/requirements/docs.txt index 434ceb84887..bb58356d58e 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/docs.txt requirements/docs.in # -alabaster==1.0.0 +alabaster==0.7.16 # via sphinx anyio==4.6.0 # via @@ -15,9 +15,7 @@ babel==2.16.0 # sphinx # sphinx-intl certifi==2024.8.30 - # via - # requests - # sphinx-prompt + # via requests charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -47,7 +45,6 @@ idna==3.10 # via # anyio # requests - # sphinx-prompt imagesize==1.4.1 # via sphinx jinja2==3.1.4 @@ -103,7 +100,7 @@ sniffio==1.3.1 # via anyio snowballstemmer==2.2.0 # via sphinx -sphinx==8.0.2 +sphinx==7.4.7 # via # -r requirements/docs.in # myst-parser @@ -134,9 +131,9 @@ sphinx-multiproject==1.0.0rc1 # via -r requirements/docs.in sphinx-notfound-page==1.0.4 # via -r requirements/docs.in -sphinx-prompt==1.9.0 +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 @@ -173,9 +170,7 @@ typing-extensions==4.12.2 # anyio # uvicorn urllib3==2.2.3 - # via - # requests - # sphinx-prompt + # via requests uvicorn==0.31.0 # via sphinx-autobuild watchfiles==0.24.0 From 93ac112b195f61e8a9cd08371f65b35aae72c9fc Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 7 Oct 2024 11:27:22 +0200 Subject: [PATCH 5/5] Test: remove failing test --- readthedocs/proxito/tests/test_headers.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/readthedocs/proxito/tests/test_headers.py b/readthedocs/proxito/tests/test_headers.py index 17eb7cf69b6..f8ace044030 100644 --- a/readthedocs/proxito/tests/test_headers.py +++ b/readthedocs/proxito/tests/test_headers.py @@ -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)