From: Rich Bennett Date: Fri, 30 Nov 2018 11:49:30 +0000 (-0500) Subject: Apply casablanca improvements to smsummary X-Git-Tag: elalto.1.5.2~8135 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=doc.git;a=commitdiff_plain;h=7fbaf50c9b84b0ca5754ce754d9e8c58f0adfaf3 Apply casablanca improvements to smsummary Use simpler git submodule status summary Remove automatic use in master branch Change-Id: Ib2e300bc2eabd3a6aed8fbd6805234f5d6a4ee7c Issue-ID: DOC-332 Signed-off-by: Rich Bennett --- diff --git a/shell/smsummary.sh b/shell/smsummary.sh index a4bd1d3fc..98c282f0e 100644 --- a/shell/smsummary.sh +++ b/shell/smsummary.sh @@ -1,3 +1,4 @@ +#!/bin/bash # Copyright (c) 2018 Open Network Automation Platform and contributors # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,11 +17,4 @@ # Usage: sh smsummary.sh output_file # -echo "************************************************************************************" > $1 -echo "* Submodule branches used to build this version of the documentation. *" >> $1 -echo "************************************************************************************" >> $1 - -git submodule foreach git for-each-ref \ - --format='%(committerdate:iso8601) %(objectname) %(HEAD) %(refname) %(subject)' \ - --sort -committerdate refs/heads/ | \ - sed -e 's:^: :' -e 's: Entering .docs/submodules/::' -e 's:.git.$::' -e 's:refs/heads/::' >> $1 +git submodule status | sed -e 's:^ ::' -e 's: :,:' -e 's: :,:' -e 's:[()]::g' -e 's:\.git::' > $1 diff --git a/tox.ini b/tox.ini index d98940758..8921c368e 100644 --- a/tox.ini +++ b/tox.ini @@ -6,8 +6,6 @@ skipsdist = true [testenv:docs] deps = -r{toxinidir}/etc/requirements.txt commands = - sh {toxinidir}/shell/smsummary.sh {toxinidir}/docs/_static/smsummary.out - echo "Summary of submodule versions used in html build in {toxinidir}/docs/_static/smsummary.out" sphinx-build -j 1 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html echo "Generated docs available in {toxinidir}/docs/_build/html" whitelist_externals =