[pypy-commit] pypy default: back out b48484eba9d0, readthedocs is messed up

mattip pypy.commits at gmail.com
Tue May 9 14:18:51 EDT 2017


Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r91215:90fb9edb78c5
Date: 2017-05-09 21:17 +0300
http://bitbucket.org/pypy/pypy/changeset/90fb9edb78c5/

Log:	back out b48484eba9d0, readthedocs is messed up

diff --git a/pypy/doc/_static/themes_override.css b/pypy/doc/_static/themes_override.css
deleted file mode 100644
--- a/pypy/doc/_static/themes_override.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* override table width restrictions */
- at media screen and (min-width: 767px) {
-
-   .wy-table-responsive table td {
-      /* !important prevents the common CSS stylesheets from overriding
-         this as on RTD they are loaded after this stylesheet */
-      white-space: normal !important;
-   }
-
-   .wy-table-responsive {
-      overflow: visible !important;
-   }
-}
-
-
diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -59,16 +59,16 @@
 
 # General information about the project.
 project = u'PyPy'
-copyright = u'2017, The PyPy Project'
+copyright = u'2016, The PyPy Project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '5.7'
+version = '5.4'
 # The full version, including alpha/beta/rc tags.
-release = '5.7.1'
+release = '5.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -141,7 +141,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -181,11 +181,6 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'PyPydoc'
 
-html_context = {
-    'css_files': [
-        '_static/themes_override.css', # override too wide tables
-    ],
-}
 
 # -- Options for LaTeX output --------------------------------------------------
 
diff --git a/pypy/doc/index-of-whatsnew.rst b/pypy/doc/index-of-whatsnew.rst
--- a/pypy/doc/index-of-whatsnew.rst
+++ b/pypy/doc/index-of-whatsnew.rst
@@ -29,14 +29,6 @@
    whatsnew-2.0.0-beta1.rst
    whatsnew-1.9.rst
 
-CPython 3.5 compatible versions
--------------------------------
-
-.. toctree::
-
-    whatsnew-pypy3-head.rst
-    whatsnew-pypy3-5.7.0.rst
-
 CPython 3.3 compatible versions
 -------------------------------
 
diff --git a/rpython/doc/_static/themes_override.css b/rpython/doc/_static/themes_override.css
deleted file mode 100644
--- a/rpython/doc/_static/themes_override.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* override table width restrictions */
- at media screen and (min-width: 767px) {
-
-   .wy-table-responsive table td {
-      /* !important prevents the common CSS stylesheets from overriding
-         this as on RTD they are loaded after this stylesheet */
-      white-space: normal !important;
-   }
-
-   .wy-table-responsive {
-      overflow: visible !important;
-   }
-}
-
-
diff --git a/rpython/doc/conf.py b/rpython/doc/conf.py
--- a/rpython/doc/conf.py
+++ b/rpython/doc/conf.py
@@ -59,16 +59,16 @@
 
 # General information about the project.
 project = u'RPython'
-copyright = u'2017, The PyPy Project'
+copyright = u'2016, The PyPy Project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '5.7'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '5.7.1'
+release = '4.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -184,11 +184,6 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'RPythondoc'
 
-html_context = {
-    'css_files': [
-        '_static/themes_override.css', # override too wide tables
-    ],
-}
 
 # -- Options for LaTeX output --------------------------------------------------
 


More information about the pypy-commit mailing list