From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from tama500.ecl.ntt.co.jp (tama500.ecl.ntt.co.jp [129.60.39.148]) by dpdk.org (Postfix) with ESMTP id 2A88F1B14C for ; Wed, 12 Dec 2018 07:28:04 +0100 (CET) Received: from vc2.ecl.ntt.co.jp (vc2.ecl.ntt.co.jp [129.60.86.154]) by tama500.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id wBC6S3vn031049; Wed, 12 Dec 2018 15:28:03 +0900 Received: from vc2.ecl.ntt.co.jp (localhost [127.0.0.1]) by vc2.ecl.ntt.co.jp (Postfix) with ESMTP id 91A9B638C67; Wed, 12 Dec 2018 15:28:03 +0900 (JST) Received: from jcms-pop21.ecl.ntt.co.jp (jcms-pop21.ecl.ntt.co.jp [129.60.87.134]) by vc2.ecl.ntt.co.jp (Postfix) with ESMTP id 83A60638C88; Wed, 12 Dec 2018 15:28:03 +0900 (JST) Received: from [IPv6:::1] (watercress.nslab.ecl.ntt.co.jp [129.60.13.73]) by jcms-pop21.ecl.ntt.co.jp (Postfix) with ESMTPSA id 73422400A9A; Wed, 12 Dec 2018 15:28:03 +0900 (JST) References: <20181211064402.15983-1-thomas@monjalon.net> From: Yasufumi Ogawa Message-ID: Date: Wed, 12 Dec 2018 15:25:36 +0900 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20181211064402.15983-1-thomas@monjalon.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-CC-Mail-RelayStamp: 1 To: Thomas Monjalon , spp@dpdk.org X-TM-AS-MML: disable Subject: Re: [spp] [PATCH] docs: fix version in guides X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2018 06:28:05 -0000 On 2018/12/11 15:44, Thomas Monjalon wrote: > When building HTML guides, the type of the version string was wrong: > > WARNING: The config value `version' has type `bytes', defaults to `str'. > WARNING: The config value `release' has type `bytes', defaults to `str'. > [...] > Exception occurred: > File "/usr/lib/python3.7/site-packages/sphinx/builders/html.py", line 479, in prepare_writing > release = return_codes_re.sub('', self.config.release), > TypeError: cannot use a string pattern on a bytes-like object > > The version number is also updated to match the latest tag. > > The option --no-print-directory is added to make showversion command, > so only the version number is printed in the doc. > > Signed-off-by: Thomas Monjalon Applied, thanks. Acked-by: Yasufumi Ogawa > --- > GNUmakefile | 5 ++--- > docs/guides/conf.py | 3 ++- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/GNUmakefile b/GNUmakefile > index 206a4c6..8984335 100644 > --- a/GNUmakefile > +++ b/GNUmakefile > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: BSD-3-Clause > # Copyright(c) 2018 Nippon Telegraph and Telephone Corporation > > -VERSION := 18.05.1 > +VERSION := 18.08 > > ifneq ($(RTE_SDK),) > # Default target, can be overriden by command line or environment > @@ -16,8 +16,7 @@ endif > > .PHONY: showversion > showversion: > - @set -- ;\ > - printf $(VERSION);\ > + @echo $(VERSION) > > # Compile RST documents > DOC_ROOT = docs/guides > diff --git a/docs/guides/conf.py b/docs/guides/conf.py > index c8d00b4..f7f0655 100644 > --- a/docs/guides/conf.py > +++ b/docs/guides/conf.py > @@ -40,7 +40,8 @@ author = '' > # |version| and |release|, also used in various other places throughout the > # built documents. > > -version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion']) > +version = subprocess.check_output(['make', '-C', '../../', > + '--no-print-directory', 'showversion']).decode('utf-8').rstrip() > > # The full version, including alpha/beta/rc tags. > release = version > -- Yasufumi Ogawa NTT Network Service Systems Labs