diff --git a/docs/conf.py b/docs/conf.py index 6b7bdca7a8..10c32f5b3c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,6 +13,7 @@ # serve to show the default. import os +import sys from typing import Any, Dict, List, Optional @@ -21,6 +22,9 @@ from typing import Any, Dict, List, Optional # documentation root, use os.path.abspath to make it absolute, like shown here. #sys.path.insert(0, os.path.abspath('.')) +sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) +from version import ZULIP_VERSION + # -- General configuration ------------------------------------------------ # If your documentation needs a minimal Sphinx version, state it here. @@ -52,9 +56,9 @@ author = 'The Zulip Team' # built documents. # # The short X.Y version. -version = '2.0+git' +version = ZULIP_VERSION # The full version, including alpha/beta/rc tags. -release = '2.0.7+git' +release = ZULIP_VERSION # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/subsystems/release-checklist.md b/docs/subsystems/release-checklist.md index c84069f8eb..884366f01c 100644 --- a/docs/subsystems/release-checklist.md +++ b/docs/subsystems/release-checklist.md @@ -34,8 +34,6 @@ preparing a new release. * Do final updates to `changelog.md`, for any final changes and with any revisions from the draft blog post. (And the date!) * Update `ZULIP_VERSION`, `LATEST_RELEASE_VERSION`, etc. in `version.py`. -* Update `version` and/or `release` in `docs/conf.py` (ReadTheDocs meta tags). - Leave "+git" off. * Use `build-release-tarball` to generate a final release tarball. * Post the release tarball on https://www.zulip.org/dist/releases/ : add the file, update the `zulip-server-latest.tar.gz` symlink, and