From 8ddc1c1ebabf14fb04b4033feaf521d17a757481 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Mon, 4 Mar 2019 14:08:11 +0000 Subject: [PATCH] fw/version: Bump to development version --- setup.py | 5 ++++- wa/framework/version.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index a1cb0cf9..45b2257a 100755 --- a/setup.py +++ b/setup.py @@ -62,6 +62,8 @@ for root, dirs, files in os.walk(wa_dir): scripts = [os.path.join('scripts', s) for s in os.listdir('scripts')] + +devlib_version = format_version(required_devlib_version) params = dict( name='wlauto', description='A framework for automating workload execution and measurement collection on ARM devices.', @@ -84,12 +86,13 @@ params = dict( 'colorama', # Printing with colors 'pyYAML>=5.1b3', # YAML-formatted agenda parsing 'requests', # Fetch assets over HTTP - 'devlib>={}'.format(format_version(required_devlib_version)), # Interacting with devices + 'devlib>={}'.format(devlib_version), # Interacting with devices 'louie-latest', # callbacks dispatch 'wrapt', # better decorators 'pandas>=0.23.0', # Data analysis and manipulation 'future', # Python 2-3 compatiblity ], + dependency_links=['https://github.com/ARM-software/devlib/tarball/master#egg=devlib-{}'.format(devlib_version)], extras_require={ 'other': ['jinja2'], 'test': ['nose', 'mock'], diff --git a/wa/framework/version.py b/wa/framework/version.py index de2934e1..227a496a 100644 --- a/wa/framework/version.py +++ b/wa/framework/version.py @@ -21,9 +21,9 @@ from subprocess import Popen, PIPE VersionTuple = namedtuple('Version', ['major', 'minor', 'revision', 'dev']) -version = VersionTuple(3, 1, 3, '') +version = VersionTuple(3, 1, 3, 'dev1') -required_devlib_version = VersionTuple(1, 1, 1, '') +required_devlib_version = VersionTuple(1, 1, 1, 'dev1') def format_version(v):