Merge lp:~canonical-platform-qa/autopilot/bump-version-number-1.6 into lp:autopilot

[Christopher Lee]

Bump version number ready for 1.6

Bump version number ready for 1.6

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:598
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/35/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3370
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3368
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3368/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21660

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/1104/rebuild

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

Looks good!

review: Approve

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:598
https://platform-qa-jenkins.ubuntu.com/job/autopilot-ci/2/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/autopilot-ci/2/rebuild

review: Approve (continuous-integration)

Unmerged revisions

598. By Christopher Lee on 2015-07-06

Update changelog for 1.6 version change.

597. By Christopher Lee on 2015-07-06

Pre req. changes.

596. By Christopher Lee on 2015-07-06

Merge 1.5 release branch.

595. By Christopher Lee on 2015-07-06

Update use of version 1.5 -> 1.6

594. By Christopher Lee on 2015-06-26

Fix test for validate_dbus_object and custom named cpo

593. By Christopher Lee on 2015-06-26

Failing test for validate_dbus_object for custom named CPOs

592. By Christopher Lee on 2015-06-26

Tests pass now

591. By Christopher Lee on 2015-06-26

Failing tests for validate_dbus_object usage

590. By Christopher Lee on 2015-06-26

Merge pre-req. changes.

589. By Christopher Lee on 2015-06-23

Pyflakes fix.

=== modified file 'autopilot/_info.py'
--- autopilot/_info.py	2014-05-04 23:13:52 +0000
+++ autopilot/_info.py	2015-07-06 05:27:20 +0000
@@ -28,7 +28,7 @@
     'version',
 ]
 
-version = '1.5.0'
+version = '1.6.0'
 
 
 def have_vis():
 
=== modified file 'autopilot/tests/functional/__init__.py'
--- autopilot/tests/functional/__init__.py	2014-05-29 19:44:44 +0000
+++ autopilot/tests/functional/__init__.py	2015-07-06 05:27:20 +0000
@@ -173,13 +173,13 @@
 
 load_entry_point_script = """\
 #!/usr/bin/python
-__requires__ = 'autopilot==1.5.0'
+__requires__ = 'autopilot==1.6.0'
 import sys
 from pkg_resources import load_entry_point
 
 if __name__ == '__main__':
     sys.exit(
-        load_entry_point('autopilot==1.5.0', 'console_scripts', 'autopilot3')()
+        load_entry_point('autopilot==1.6.0', 'console_scripts', 'autopilot3')()
     )
 """
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-05-08 04:45:01 +0000
+++ debian/changelog	2015-07-06 05:27:20 +0000
@@ -1,12 +1,66 @@
-autopilot (1.5.0) UNRELEASED; urgency=medium
-
+autopilot (1.6.0) UNRELEASED; urgency=medium
+
+  [ Christopher Lee ]
+  * Allow Custom Proxy Object classes to have a different name to that of the
+    underlying UI Type (lp:1337004).
+  * Remove the idea of (and the actual) object registry (lp:1457629).
+  * Provide classmethod to instantiate a Custom Proxy Object instance from an
+    existing proxy object.
+  * Update documentation to cover new CPO behaviour and removal of the object
+    registry.
+  * Fix for validate_dbus_object not being called.
+
+ -- Christopher Lee <[e-mail]>  Mon, 06 Jul 2015 16:41:10 +1200
+
+autopilot (1.5.1+15.04.20150522-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Christopher Lee, Federico Gimenez, Leo Arias, Richard Huddie, Vincent Ladeuil ]
+  * Bug fixes for logging (debug level now -vv) and application of CPO
+    bases for proxy objects. (LP: #1425721, #1376996, #1420949)
+
+ -- CI Train Bot <[e-mail]>  Fri, 22 May 2015 16:54:03 +0000
+
+autopilot (1.5.0+15.04.20150408-0ubuntu1) vivid; urgency=medium
+
+  [ Albert Astals Cid ]
+  * Bug fixes related to improving automated runs.
+
+  [ Christopher Lee ]
+  * Bug fixes related to improving automated runs.
+
+ -- CI Train Bot <[e-mail]>  Wed, 08 Apr 2015 15:07:28 +0000
+
+autopilot (1.5.0+15.04.20150323-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Christopher Lee ]
+  * Bugfix for Touch pointer pressed. Packaging req. due to python3-xlib
+    bug.
+
+  [ Leo Arias ]
+  * Bugfix for Touch pointer pressed. Packaging req. due to python3-xlib
+    bug.
+
+ -- CI Train Bot <[e-mail]>  Mon, 23 Mar 2015 09:34:31 +0000
+
+autopilot (1.5.0+15.04.20150226.1-0ubuntu1) vivid; urgency=medium
+
+  [ Christopher Lee ]
   * Fix for desktop file name change (lp:1411096)
     Fix for config value containing '=' char (lp:1408317)
     Fix for skipped tests not appearing in log (lp:1414632)
     Add json docs build (for web publish) (lp:1409778)
     Documentation improvements for API, Tutorial, FAQ, and Guidelines
 
- -- Christopher Lee <[e-mail]>  Fri, 27 Feb 2015 10:16:42 +1300
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+ -- CI Train Bot <[e-mail]>  Thu, 26 Feb 2015 22:47:35 +0000
 
 autopilot (1.5.0+15.04.20141031-0ubuntu1) vivid; urgency=low
 
@@ -131,7 +185,7 @@
   * Remove python2 packages and dependencies, as they're now handled by the
     autopilot-legacy source package. (lp: #1308661)
   * Autopilot vis tool can now search the introspection tree. (lp: #1097392)
-  * Autopilot vis tool can now draw a transparent overlay over the selected 
+  * Autopilot vis tool can now draw a transparent overlay over the selected
     widget.
   * Autopilot vis tool now shows the root of the introspection tree (lp: #1298600)
   * Autopilot vis tool can now be launched from the unity dash.
@@ -265,7 +319,7 @@
 
 autopilot (1.4+14.04.20140310.1-0ubuntu1) trusty; urgency=low
 
-  * 
+  *
 
  -- Ubuntu daily release <[e-mail]>  Mon, 10 Mar 2014 19:39:00 +0000
 
 
=== modified file 'docs/conf.py'
--- docs/conf.py	2014-07-11 03:29:28 +0000
+++ docs/conf.py	2015-07-06 05:27:20 +0000
@@ -75,7 +75,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.5'
+version = '1.6'
 
 # The full version, including alpha/beta/rc tags.
 try:
 
=== modified file 'setup.py'
--- setup.py	2014-05-15 05:59:11 +0000
+++ setup.py	2015-07-06 05:27:20 +0000
@@ -24,7 +24,7 @@
 from setuptools import find_packages, setup, Extension
 
 
-VERSION = '1.5.0'
+VERSION = '1.6.0'
 
 
 autopilot_tracepoint = Extension(