fw/version: Version bump for minor fixes

Ensure that all subfolders are included in the MANIFEST otherwise when
packaging WA there can be missing files.

MANIFEST.in

@@ -1,2 +1,3 @@
 recursive-include scripts *
 recursive-include doc *
+recursive-include wa *

doc/source/changes.rst

@@ -2,6 +2,20 @@
 What's New in Workload Automation
 =================================
 
+*************
+Version 3.1.1
+*************
+
+Fixes/Improvements
+==================
+
+Other
+-----
+    - Improve formatting when displaying metrics
+    - Update revent binaries to include latest fixes
+    - Update DockerImage to use new released version of WA and Devlib
+    - Fix broken package on PyPi
+
 *************
 Version 3.1.0
 *************

extras/Dockerfile

@@ -42,8 +42,8 @@ FROM ubuntu:17.10
 
 # Please update the references below to use different versions of
 # devlib, WA or the Android SDK
-ARG DEVLIB_REF=v1.0.0
-ARG WA_REF=v3.0.0
+ARG DEVLIB_REF=v1.1.0
+ARG WA_REF=v3.1.1
 ARG ANDROID_SDK_URL=https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
 
 RUN apt-get update

wa/framework/output.py

@@ -37,7 +37,7 @@ from wa.framework.run import RunState, RunInfo
 from wa.framework.target.info import TargetInfo
 from wa.framework.version import get_wa_version_with_commit
 from wa.utils.doc import format_simple_table
-from wa.utils.misc import touch, ensure_directory_exists, isiterable
+from wa.utils.misc import touch, ensure_directory_exists, isiterable, format_ordered_dict
 from wa.utils.postgres import get_schema_versions
 from wa.utils.serializer import write_pod, read_pod, Podable, json
 from wa.utils.types import enum, numeric
@@ -635,7 +635,7 @@ class Metric(Podable):
     def __repr__(self):
         text = self.__str__()
         if self.classifiers:
-            return '<{} {}>'.format(text, self.classifiers)
+            return '<{} {}>'.format(text, format_ordered_dict(self.classifiers))
         else:
             return '<{}>'.format(text)
 

wa/framework/version.py

@@ -21,7 +21,7 @@ from subprocess import Popen, PIPE
 
 VersionTuple = namedtuple('Version', ['major', 'minor', 'revision'])
 
-version = VersionTuple(3, 1, 0)
+version = VersionTuple(3, 1, 1)
 
 
 def get_wa_version():

wa/utils/misc.py

@@ -626,3 +626,13 @@ def resolve_unique_domain_cpus(name, target):
         if domain_cpus[0] not in unique_cpus:
             unique_cpus.append(domain_cpus[0])
     return unique_cpus
+
+
+def format_ordered_dict(od):
+    """
+    Provide a string representation of ordered dict that is similar to the
+    regular dict representation, as that is more concise and easier to read
+    than the default __str__ for OrderedDict.
+    """
+    return '{{{}}}'.format(', '.join('{}={}'.format(k, v)
+                                     for k, v in od.items()))