Release 1.1.0b1 + 1.1.0b2 (bump versions with bump2version) (#1352)

* Bump to 1.1.0 using bump2version

* Use PEP440 and make it a beta, i.e. "1.1.0b1"

* Auto-generated package-lock.json but with version bumps

* Bump to 1.1.0b2, rebuild assets

docs/changelog.rst

@@ -5,12 +5,12 @@ Changelog
 Development version (|development_version|)
 ===========================================
 
-.. |development_version| replace:: 1.1.0alpha1
+.. |development_version| replace:: 1.1.0b2
 
-.. _release-1.1.0alpha1:
+.. _release-1.1.0b2:
 
-1.1.0alpha1
-===========
+1.1.0b2
+=======
 
 Dependency Changes
 ------------------

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sphinx_rtd_theme",
   "main": "js/theme.js",
-  "version": "1.0.1alpha1",
+  "version": "1.1.0b2",
   "scripts": {
     "dev": "webpack-dev-server --open --config webpack.dev.js",
     "build": "webpack --config webpack.prod.js",

setup.cfg

@@ -1,3 +1,12 @@
+[bumpversion]
+current_version = 1.1.0b2
+commit = false
+tag = false
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<dev>\d+))?
+serialize = 
+	{major}.{minor}.{patch}{release}{dev}
+	{major}.{minor}.{patch}
+
 [metadata]
 name = sphinx_rtd_theme
 url = https://github.com/readthedocs/sphinx_rtd_theme
@@ -6,67 +15,59 @@ author = Dave Snider, Read the Docs, Inc. & contributors
 author_email = dev@readthedocs.org
 description = Read the Docs theme for Sphinx
 long_description = file: README.rst
-project_urls =
-  Homepage = https://sphinx-rtd-theme.readthedocs.io/
-  Source Code = https://github.com/readthedocs/sphinx_rtd_theme
-  Issue Tracker = https://github.com/readthedocs/sphinx_rtd_theme/issues
-classifiers =
-  Framework :: Sphinx
-  Framework :: Sphinx :: Theme
-  Development Status :: 5 - Production/Stable
-  License :: OSI Approved :: MIT License
-  Environment :: Console
-  Environment :: Web Environment
-  Intended Audience :: Developers
-  Programming Language :: Python :: 2.7
-  Programming Language :: Python :: 3
-  Programming Language :: Python :: 3.6
-  Programming Language :: Python :: 3.7
-  Programming Language :: Python :: 3.8
-  Programming Language :: Python :: 3.9
-  Programming Language :: Python :: 3.10
-  Operating System :: OS Independent
-  Topic :: Documentation
-  Topic :: Software Development :: Documentation
+project_urls = 
+	Homepage = https://sphinx-rtd-theme.readthedocs.io/
+	Source Code = https://github.com/readthedocs/sphinx_rtd_theme
+	Issue Tracker = https://github.com/readthedocs/sphinx_rtd_theme/issues
+classifiers = 
+	Framework :: Sphinx
+	Framework :: Sphinx :: Theme
+	Development Status :: 5 - Production/Stable
+	License :: OSI Approved :: MIT License
+	Environment :: Console
+	Environment :: Web Environment
+	Intended Audience :: Developers
+	Programming Language :: Python :: 2.7
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
+	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Operating System :: OS Independent
+	Topic :: Documentation
+	Topic :: Software Development :: Documentation
+
 [options]
 include_package_data = True
 zip_safe = False
 packages = sphinx_rtd_theme
 python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
-install_requires =
-  sphinx >=1.6,<6
-  docutils <0.18
-  Jinja2 <3.1
-tests_require =
-  pytest
+install_requires = 
+	sphinx >=1.6,<6
+	docutils <0.18
+	Jinja2 <3.1
+tests_require = 
+	pytest
 
 [options.extras_require]
-dev =
-  transifex-client
-  sphinxcontrib-httpdomain
-  bump2version
-  wheel
+dev = 
+	transifex-client
+	sphinxcontrib-httpdomain
+	bump2version
+	wheel
 
 [options.entry_points]
-sphinx.html_themes =
-  sphinx_rtd_theme = sphinx_rtd_theme
+sphinx.html_themes = 
+	sphinx_rtd_theme = sphinx_rtd_theme
 
 [options.package_data]
-sphinx_rtd_theme =
-  theme.conf
-  *.html
-  static/css/*.css
-  static/css/fonts/*.*
-  static/js/*.js
-
-[bumpversion]
-current_version = 1.0.1alpha1
-commit = false
-tag = false
-parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<dev>\d+))?
-serialize = 
-	{major}.{minor}.{patch}{release}{dev}
-	{major}.{minor}.{patch}
+sphinx_rtd_theme = 
+	theme.conf
+	*.html
+	static/css/*.css
+	static/css/fonts/*.*
+	static/js/*.js
 
 [bdist_wheel]
 universal = 1

setup.py

@@ -86,7 +86,7 @@ def run(self):
 
 
 setup(
-    version='1.0.1alpha1',
+    version='1.1.0b2',
     cmdclass={
         'update_translations': UpdateTranslationsCommand,
         'transifex': TransifexCommand,

sphinx_rtd_theme/__init__.py

@@ -31,6 +31,12 @@ def config_initiated(app, config):
             _('The canonical_url option is deprecated, use the html_baseurl option from Sphinx instead.')
         )
 
+
+def extend_html_context(app, pagename, templatename, context, doctree):
+     # Add ``sphinx_version_info`` tuple for use in Jinja templates
+     context['sphinx_version_info'] = sphinx_version
+
+
 # See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package
 def setup(app):
     if python_version[0] < 3:
@@ -60,4 +66,7 @@ def setup(app):
     else:
         app.config.html_add_permalinks = "\uf0c1"
 
+    # Extend the default context when rendering the templates.
+    app.connect("html-page-context", extend_html_context)
+
     return {'parallel_read_safe': True, 'parallel_write_safe': True}

sphinx_rtd_theme/layout.html

@@ -9,10 +9,6 @@
 {%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
 {%- set sphinx_writer = 'writer-html5' if html5_doctype else 'writer-html4' -%}
 
-{# Build sphinx_version_info tuple from sphinx_version string in pure Jinja #}
-{%- set (_ver_major, _ver_minor) = (sphinx_version.split('.') | list)[:2] | map('int') -%}
-{%- set sphinx_version_info = (_ver_major, _ver_minor, -1) -%}
-
 <!DOCTYPE html>
 <html class="{{ sphinx_writer }}" lang="{{ lang_attr }}" >
 <head>