From 1a2ec5c2e964ef501301211c492d79655c85932c Mon Sep 17 00:00:00 2001 From: hkouki Date: Tue, 14 Feb 2017 11:44:52 +0100 Subject: [PATCH] bump to 3.11.14 Change-Id: I74c7ff3bec9df83423c90fc4f8701f61269f5d8b --- cmake/qibuild/version.cmake | 2 +- doc/source/changelog.rst | 2 +- doc/source/changes/{3.11.13.rst => 3.11.14.rst} | 2 +- doc/source/conf.in.py | 2 +- python/qisys/main.py | 2 +- setup.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename doc/source/changes/{3.11.13.rst => 3.11.14.rst} (98%) diff --git a/cmake/qibuild/version.cmake b/cmake/qibuild/version.cmake index 076fcd269..e1f11c8a3 100644 --- a/cmake/qibuild/version.cmake +++ b/cmake/qibuild/version.cmake @@ -1,4 +1,4 @@ ## Copyright (c) 2012-2015 Aldebaran Robotics. All rights reserved. ## Use of this source code is governed by a BSD-style license that can be ## found in the COPYING file. -set(QIBUILD_VERSION "3.11.13" CACHE STRING "qibuild version" FORCE) +set(QIBUILD_VERSION "3.11.14" CACHE STRING "qibuild version" FORCE) diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index 7ed128480..47ae2bf7e 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -6,7 +6,7 @@ Changelog .. toctree:: :maxdepth: 1 - changes/3.11.13 + changes/3.11.14 changes/3.11.12 changes/3.11.9 changes/3.11.6 diff --git a/doc/source/changes/3.11.13.rst b/doc/source/changes/3.11.14.rst similarity index 98% rename from doc/source/changes/3.11.13.rst rename to doc/source/changes/3.11.14.rst index 392ec9322..4dfef2362 100644 --- a/doc/source/changes/3.11.13.rst +++ b/doc/source/changes/3.11.14.rst @@ -1,4 +1,4 @@ -v3.11.13 +v3.11.14 ======== qipkg diff --git a/doc/source/conf.in.py b/doc/source/conf.in.py index 6dd0b5e1f..6459abba4 100644 --- a/doc/source/conf.in.py +++ b/doc/source/conf.in.py @@ -3,7 +3,7 @@ ## found in the COPYING file. project = u'qiBuild' -version = '3.11.13' +version = '3.11.14' release = version sys.path.insert(0, os.path.abspath('../tools')) # for autodoc diff --git a/python/qisys/main.py b/python/qisys/main.py index 5377e1531..1a84dc5a4 100644 --- a/python/qisys/main.py +++ b/python/qisys/main.py @@ -12,7 +12,7 @@ import qisys.script def print_version(script_name): - sys.stdout.write("%s version 3.11.13\n" % script_name) + sys.stdout.write("%s version 3.11.14\n" % script_name) import qibuild qibuild_dir = os.path.dirname(qibuild.__file__) python_dir = os.path.dirname(qibuild_dir) diff --git a/setup.py b/setup.py index 36683d6bf..8d9c1dc3a 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ def get_qibuild_cmake_files(): data_files = get_qibuild_cmake_files() setup(name="qibuild", - version="3.11.13", + version="3.11.14", description="The meta build framework", url="http://doc.aldebaran.com/qibuild", author="Aldebaran Robotics",