From c94985579635ad1791246493f7ec024ebe9abbac Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 21 Nov 2023 10:18:59 +0200 Subject: [PATCH 1/4] Add config file for Read the Docs (#2328) * Add config file for Read the Docs * Remove comment --- .gitignore | 1 + .readthedocs.yaml | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 .readthedocs.yaml diff --git a/.gitignore b/.gitignore index 954ff2401..a9eca9d19 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ # $ git config --global core.excludesfile ~/.gitignore_global .sass-cache/ +docs/build media/* static-root/ static/stylesheets/mq.css diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..ec9dc1ce9 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,15 @@ +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details +# Project page: https://readthedocs.org/projects/pythondotorg/ + +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3" + + commands: + - python -m pip install -r docs-requirements.txt + - make -C docs html JOBS=$(nproc) BUILDDIR=_readthedocs + - mv docs/_readthedocs _readthedocs From f04b96f59147015676cf2b283684b381aef27a55 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 21 Nov 2023 10:22:56 +0200 Subject: [PATCH 2/4] Remove broken Twitter widget (#2329) * Remove broken Twitter widget * Remove broken Twitter widget --- static/sass/style.css | 4 --- static/sass/style.scss | 3 -- templates/components/tweets-from-psf.html | 4 --- templates/pages/default.html | 2 -- templates/pages/pep-page.html | 2 -- templates/psf/default.html | 2 -- templates/python/inner.html | 33 +--------------------- templates/successstories/base.html | 2 -- templates/waitforit.html | 34 +---------------------- 9 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 templates/components/tweets-from-psf.html diff --git a/static/sass/style.css b/static/sass/style.css index ad49c77b4..c3d2bb5f9 100644 --- a/static/sass/style.css +++ b/static/sass/style.css @@ -2771,10 +2771,6 @@ p.quote-by-organization { /* {% endblock left_sidebar %} diff --git a/templates/python/inner.html b/templates/python/inner.html index 06b1ad99e..542e6cb64 100644 --- a/templates/python/inner.html +++ b/templates/python/inner.html @@ -623,40 +623,9 @@

Form Example

{% block left_sidebar %} {% endblock left_sidebar %} diff --git a/templates/waitforit.html b/templates/waitforit.html index a7bc8f532..a27a9e274 100644 --- a/templates/waitforit.html +++ b/templates/waitforit.html @@ -22,37 +22,5 @@

Wait for it…

{% block left_sidebar %} -{% endblock left_sidebar %} \ No newline at end of file +{% endblock left_sidebar %} From 0f881058596384d2ff167ade73d732edac58068c Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Sat, 9 Dec 2023 10:10:41 -0500 Subject: [PATCH 3/4] fix misleading link in site-tree fixture --- fixtures/sitetree_menus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/sitetree_menus.json b/fixtures/sitetree_menus.json index 85fb6b6b0..70ad3fc7c 100644 --- a/fixtures/sitetree_menus.json +++ b/fixtures/sitetree_menus.json @@ -2557,7 +2557,7 @@ "fields": { "title": "PSF Sponsors", "hint": "", - "url": "/psf/sponsorship/sponsors/", + "url": "/psf/sponsors/", "urlaspattern": false, "tree": 1, "hidden": false, From e6118a4540060d53ad807a846979b34952fb208c Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Thu, 14 Dec 2023 14:14:27 -0500 Subject: [PATCH 4/4] Update sponsor_new_application.txt --- templates/sponsors/email/sponsor_new_application.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/sponsors/email/sponsor_new_application.txt b/templates/sponsors/email/sponsor_new_application.txt index 486e4ef34..e859386bf 100644 --- a/templates/sponsors/email/sponsor_new_application.txt +++ b/templates/sponsors/email/sponsor_new_application.txt @@ -1,9 +1,11 @@ {% load sponsors %} Dear {{ sponsorship.sponsor.name }} {% if sponsorship.for_modified_package %} -Thank you for submitting your sponsorship application. We will contact you to discuss finalizing the customized sponsorship package within 2 business days. +Thank you for submitting your sponsorship application. +We will contact you to discuss finalizing the customized sponsorship package within 5 business days. {% else %} -Thank you for submitting your sponsorship application. We will be sending a Contract reflecting the sponsorship contract details. +Thank you for submitting your sponsorship application. +We will be sending a Contract reflecting the sponsorship contract details within 5 business days. {% endif %} You can review your full application and a list of benefits you will receive below.