From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id DAC4D2C2B for ; Tue, 11 Dec 2018 07:44:21 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 740A4217DD; Tue, 11 Dec 2018 01:44:21 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 11 Dec 2018 01:44:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=ack3qN3Nh3rmqpwRo4BVbtk IzdRYHSbvzYFEIic9BEM=; b=BWbU6QqwEZ07bL4xBMvt9HyESBKF6zeyEb6M8wN KcgLFt135Ib+uZfrBKj3y20JNc6KyLpKHdErxy2Vpy96UhyfcIjP0lCMwEIv1LRi kGV92QIWvHQ/LvmOuJLe4iZq+6jIs6jh+rgzxzXcFHHC0Y9/dmkksyLleylL83pd /180= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=ack3qN3Nh3rmqpwRo 4BVbtkIzdRYHSbvzYFEIic9BEM=; b=SoHe4YABbAw2pwtDlgxrq+12pGLnoBK+/ 7YBQ5oyLdGwUe8JHfau3XeQm8uBR9PZ0ETkggBXsXIGnNfaUKHePG8LUHvq329Ix hLCx9lfQFvkdDrUiGvJpb+RhQ6iyllrfGekw5P4vcqHdsGB8VyO/M39bKZnK6lE6 D6/Re4lA4dhj5ZhWC0pPPFvf8Mc1c/E82O3H3GMD7sf2O62m9ttSCEq6kyJqdEXq X+B56GcZq+PgaFVXVtBgCUwq4yYRCYXrauT6tsFbYJD/r6iPwUytJcDzM3/h/Cay sU5ktALciZ+wzxCQNXCfqvNVz5RbZaPjE1ieEHSlzYZ1RZR6mztVA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudegiedgleelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhh homhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheq necukfhppeejjedrudefgedrvddtfedrudekgeenucfrrghrrghmpehmrghilhhfrhhomh epthhhohhmrghssehmohhnjhgrlhhonhdrnhgvthenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 489ACE446A for ; Tue, 11 Dec 2018 01:44:20 -0500 (EST) From: Thomas Monjalon To: spp@dpdk.org Date: Tue, 11 Dec 2018 07:44:02 +0100 Message-Id: <20181211064402.15983-1-thomas@monjalon.net> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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: Tue, 11 Dec 2018 06:44:22 -0000 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 --- 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 -- 2.19.0