Merge main into release (#2330)

* Add config file for Read the Docs (#2328) * Add config file for Read the Docs * Remove comment * Remove broken Twitter widget (#2329) * Remove broken Twitter widget * Remove broken Twitter widget --------- Co-authored-by: Hugo van Kemenade <[email protected]>
python · Nov 21, 2023 · f3eebba · f3eebba
1 parent f7ff441
commit f3eebba
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 84 deletions.
diff --git 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
@@ -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
diff --git a/static/sass/style.css b/static/sass/style.css
@@ -2771,10 +2771,6 @@ p.quote-by-organization {
 /*<aside class="main-sidebar | right-sidebar | left-sidebar">*/
 .left-sidebar .sidebar-widget {
   margin-bottom: 0.875em; }
-.left-sidebar .twitter-widget {
-  padding: 0; }
-.left-sidebar .twtr-doc {
-  padding: .75em; }
 
 .jobs-form p {
   padding: 0 0.3125em; }

diff --git a/static/sass/style.scss b/static/sass/style.scss
@@ -1913,9 +1913,6 @@ $colors: $blue, $psf, $yellow, $green, $purple, $red;
         margin-bottom: rhythm( .5 );
     }
 
-    .twitter-widget { padding: 0; }
-
-    .twtr-doc { padding: .75em; }
 }
 
 .right-sidebar {

diff --git a/templates/components/tweets-from-psf.html b/templates/components/tweets-from-psf.html
diff --git a/templates/pages/default.html b/templates/pages/default.html
@@ -54,8 +54,6 @@ <h1 class="page-title">{{ page.title }}</h1>
 
     {% include "components/navigation-widget.html" %}
 
-    {% include "components/tweets-from-psf.html" %}
-
     <div class="psf-sidebar-widget sidebar-widget">
         {% box 'widget-sidebar-aboutpsf' %}
 

diff --git a/templates/pages/pep-page.html b/templates/pages/pep-page.html
@@ -73,8 +73,6 @@ <h1 class="page-title">{{ page.title }}</h1>
 
     {% include "components/navigation-widget.html" %}
 
-    {% include "components/tweets-from-psf.html" %}
-
     <div class="psf-sidebar-widget sidebar-widget">
         {% box 'widget-sidebar-aboutpsf' %}
 

diff --git a/templates/psf/default.html b/templates/psf/default.html
@@ -68,8 +68,6 @@ <h1 class="page-title">{{ page.title }}</h1>
 
         </div>
 
-        {% include "components/tweets-from-psf.html" %}
-
     </aside>
 
 {% endblock left_sidebar %}
diff --git a/templates/python/inner.html b/templates/python/inner.html
@@ -623,40 +623,9 @@ <h1 id="form">Form Example</h1>
 
 {% block left_sidebar %}
 <aside class="left-sidebar" role="secondary">
-  
+
     {% include "components/navigation-widget.html" %}
 
-    <div class="twitter-widget sidebar-widget">
-        <script type="text/javascript" src="//widgets.twimg.com/j/2/widget.js"></script>
-        <script type="text/javascript">// <![CDATA[
-        new TWTR.Widget({
-          version: 2,
-          type: 'profile',
-          rpp: 3,
-          interval: 30000,
-          width: 'auto',
-          height: 300,
-          theme: {
-            shell: {
-              background: '#f2f2f2',
-              color: '#666666'
-            },
-            tweets: {
-              background: '#f2f2f2',
-              color: '#666666',
-              links: '#3776ab'
-            }
-          },
-          features: {
-            scrollbar: false,
-            loop: false,
-            live: false,
-            behavior: 'all'
-          }
-        }).render().setUser('ThePSF').start();
-        // ]]></script>
-    </div>
-
     <div class="psf-sidebar-widget sidebar-widget">
         <h3 class="widget-title">The PSF</h3>
         <p>The Python Software Foundation is the organization behind Python. Become a member of the PSF and help advance the software and our mission. </p>

diff --git a/templates/successstories/base.html b/templates/successstories/base.html
@@ -26,7 +26,5 @@
 
     </div>
 
-    {% include "components/tweets-from-psf.html" %}
-
 </aside>
 {% endblock left_sidebar %}
diff --git a/templates/waitforit.html b/templates/waitforit.html
@@ -22,37 +22,5 @@ <h1 class="giga">Wait for it&hellip;</h1>
 
 {% block left_sidebar %}
 <aside class="left-sidebar" role="secondary">
-
-    <div class="twitter-widget sidebar-widget">
-        <script type="text/javascript" src="//widgets.twimg.com/j/2/widget.js"></script>
-        <script type="text/javascript">// <![CDATA[
-        new TWTR.Widget({
-          version: 2,
-          type: 'profile',
-          rpp: 3,
-          interval: 30000,
-          width: 'auto',
-          height: 300,
-          theme: {
-            shell: {
-              background: '#efefef',
-              color: '#666666'
-            },
-            tweets: {
-              background: '#f2f2f2',
-              color: '#666666',
-              links: '#3776ab'
-            }
-          },
-          features: {
-            scrollbar: false,
-            loop: false,
-            live: false,
-            behavior: 'all'
-          }
-        }).render().setUser('ThePSF').start();
-        // ]]></script>
-    </div>
-
 </aside>
-{% endblock left_sidebar %}
+{% endblock left_sidebar %}