Merge branch 'master' into Blendify/fix-math-link-icon

agjohnson · web-flow · commit bd19ad5ce979 · 2021-08-12T10:00:12.000-06:00
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,11 +2,10 @@
 Changelog
 *********
 
-master
-======
+Development version (|development_version|)
+===========================================
 
-v1.0.0
-======
+.. |development_version| replace:: 1.0.0alpha1
 
 Incompatible Changes
 --------------------
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -197,4 +197,8 @@ To release a new version of the theme, core team will take the following steps:
       $ python setup.py sdist bdist_wheel
       $ twine upload --sign --identity security@readthedocs.org dist/*
 
+#. Finally, open a new pull request updating the development release version to
+   the next patch by running ``bump2version patch``. Open a pull request with
+   this change.
+
 .. _PEP440: https://www.python.org/dev/peps/pep-0440/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sphinx_rtd_theme",
   "main": "js/theme.js",
-  "version": "0.5.2",
+  "version": "1.0.0alpha1",
   "scripts": {
     "dev": "webpack-dev-server --open --config webpack.dev.js",
     "build": "webpack --config webpack.prod.js",
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.2
+current_version = 1.0.0alpha1
 commit = false
 tag = false
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<dev>\d+))?
@@ -53,4 +53,6 @@ replace = "version": "{new_version}",
 search = "version": "{current_version}",
 replace = "version": "{new_version}",
 
-[bumpversion:file:docs/conf.py]
+[bumpversion:file:docs/changelog.rst]
+search = .. |development_version| replace:: {current_version}
+replace = .. |development_version| replace:: {new_version}
diff --git a/setup.py b/setup.py
@@ -87,7 +87,7 @@ def run(self):
 
 setup(
     name='sphinx_rtd_theme',
-    version='0.5.2',
+    version='1.0.0alpha1',
     url='https://github.com/readthedocs/sphinx_rtd_theme',
     license='MIT',
     author='Dave Snider, Read the Docs, Inc. & contributors',
diff --git a/sphinx_rtd_theme/__init__.py b/sphinx_rtd_theme/__init__.py
@@ -12,7 +12,7 @@
 from sphinx.util.logging import getLogger
 
 
-__version__ = '0.5.2'
+__version__ = '1.0.0alpha1'
 __version_full__ = __version__
 
 logger = getLogger(__name__)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sphinx_rtd_theme",`
`3`	`3`	`"main": "js/theme.js",`
`4`		`- "version": "0.5.2",`
	`4`	`+ "version": "1.0.0alpha1",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "webpack-dev-server --open --config webpack.dev.js",`
`7`	`7`	`"build": "webpack --config webpack.prod.js",`