Conditional fixes for the documentation message box

galaxyproject · Jan 18, 2018 · 4bdebe0 · 4bdebe0
1 parent 98e369c
commit 4bdebe0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/doc/source/conf.versioning.py b/doc/source/conf.versioning.py
@@ -24,8 +24,7 @@
 MIN_DOC_VERSION = LooseVersion('17.05')
 
 # Enable simpleversioning
-if GIT_BRANCH:
-    extensions += ['sphinxcontrib.simpleversioning']
+extensions += ['sphinxcontrib.simpleversioning']
 
 # -- sphinxcontrib-simpleversioning Settings ---------------------------------
 
@@ -56,9 +55,11 @@
     {'id': 'latest', 'name': 'dev'},
 )
 
-if TARGET_GIT_BRANCH.startswith('release_') and not TARGET_GIT_BRANCH == 'release_%s' % _stable:
-    simpleversioning_show_banner = True
-    simpleversioning_banner_message = OLD_BANNER
+if TARGET_GIT_BRANCH.startswith('release_'):
+    # The current stable release will go here but fail the next conditional, avoiding either banner.
+    if TARGET_GIT_BRANCH != 'release_%s' % _stable:
+        simpleversioning_show_banner = True
+        simpleversioning_banner_message = OLD_BANNER
 elif TARGET_GIT_BRANCH != 'master':
     simpleversioning_show_banner = True
     simpleversioning_banner_message = DEV_BANNER