Merge lp:~unity-team/unity/python3-ready into lp:unity

[Marco Trevisan (Treviño)]

unity: ensure we use python3 for the launch script and python2.7 for autopilot

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4040
http://jenkins.qa.ubuntu.com/job/unity-ci/1338/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/115/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/113/console

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

review: Needs Fixing (continuous-integration)

[Barry Warsaw (barry)]

A couple of comments where I still see Python 2 referenced.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4040
http://jenkins.qa.ubuntu.com/job/unity-ci/1340/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/115/console

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

As replied in comments, we still need python2 for unity-autopilot package, which is in universe.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4040
http://jenkins.qa.ubuntu.com/job/unity-ci/1342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/117/console

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

review: Needs Fixing (continuous-integration)

[Barry Warsaw (barry)]

On Nov 06, 2015, at 11:45 AM, Marco Trevisan (Treviño) wrote:

>As replied in comments, we still need python2 for unity-autopilot package,
>which is in universe.

[...]

>autopilot-legacy is still using python2 (and I don't think it's worth to port
>it), so we need to get these to be properly installed for it to see them.

Agreed that it doesn't make sense to port autopilot. If it's a build-time
dependency, there's no problem, so this change LGTM. +1

Thanks for the explanation.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4040
http://jenkins.qa.ubuntu.com/job/unity-ci/1346/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/123/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/122/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/121/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4040
http://jenkins.qa.ubuntu.com/job/unity-ci/1351/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/3

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4041
http://jenkins.qa.ubuntu.com/job/unity-ci/1353/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/5/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4043
http://jenkins.qa.ubuntu.com/job/unity-ci/1355/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/7

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4044
http://jenkins.qa.ubuntu.com/job/unity-ci/1358/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/10

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4045
http://jenkins.qa.ubuntu.com/job/unity-ci/1359/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/11

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

review: Approve (continuous-integration)

[Barry Warsaw (barry)]

Hi, what's the status of this merge proposal and the linked bug?

[Sebastien Bacher (seb128)]

seems to have created that issue
https://bugs.launchpad.net/ubuntu/+source/unity/+bug/1526455

" File "/usr/bin/unity", line 110, in process_and_start_unity
    if re.match(r"^compiz\b", cmdline):
  File "/usr/lib/python3.5/re.py", line 163, in match
    return _compile(pattern, flags).match(string)
TypeError: cannot use a string pattern on a bytes-like object"

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-02 13:29:58 +0000
+++ debian/changelog	2015-12-11 12:38:15 +0000
@@ -1,3 +1,16 @@
+unity (7.4.0+16.04.20151102-0ubuntu3) UNRELEASED; urgency=medium
+
+  * unity: ensure we use python3 for the launch script and
+    python2.7 for autopilot (LP: #1512909)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 11 Dec 2015 12:36:15 +0000
+
+unity (7.4.0+16.04.20151102-0ubuntu2) xenial; urgency=medium
+
+  * No-change rebuild against libglew1.13
+
+ -- Steve Langasek <[e-mail]>  Wed, 11 Nov 2015 19:49:37 +0000
+
 unity (7.4.0+16.04.20151102-0ubuntu1) xenial; urgency=medium
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'debian/control'
--- debian/control	2015-11-02 13:29:35 +0000
+++ debian/control	2015-12-11 12:38:15 +0000
@@ -8,6 +8,7 @@
                dbus-test-runner,
                dh-migrations,
                dh-translations (>= 94),
+               dh-python,
                google-mock (>= 1.6.0+svn437),
                gsettings-desktop-schemas-dev,
                gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219),
@@ -48,6 +49,7 @@
                libzeitgeist-2.0-dev,
                pkg-config,
                python (>= 2.7),
+               python3 (>= 3.4),
                python-setuptools,
                quilt,
                xserver-xorg-video-dummy,
@@ -62,7 +64,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          libunity-core-6.0-9 (= ${binary:Version}),
          compiz,
          compiz-core, compiz-core-abiversion-${coreabiversion},

=== modified file 'debian/rules'
--- debian/rules	2015-10-30 16:13:00 +0000
+++ debian/rules	2015-12-11 12:38:15 +0000
@@ -10,17 +10,17 @@
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 
 # avoid template instance removal (lp:1286284)
-export DEB_CXXFLAGS_MAINT_STRIP=-O3
-export DEB_CXXFLAGS_MAINT_APPEND=-O2
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), ppc64el))
+  export DEB_CXXFLAGS_MAINT_STRIP=-O3
+  export DEB_CXXFLAGS_MAINT_APPEND=-O2
+endif
 
 # http://ccache.samba.org/manual.html#_precompiled_headers
 CCACHE_SLOPPINESS=time_macros
 
 CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/abiversion.h )
 NUX_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+NUX_ABIVERSION[[:space:]]+//p' /usr/include/Nux-4.0/Nux/ABI.h )
-
 LIBUNITY_PRIVATE := $(shell pkg-config --libs-only-L unity-protocol-private | sed -e 's/-L\(.*\)/\1/' )
-
 SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
 
 cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCMAKE_SYSCONFDIR=/etc -DCOMPIZ_PLUGIN_INSTALL_TYPE=package 
@@ -28,11 +28,6 @@
   cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
 endif
 
-# Workaround for bug #1511542
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), arm64))
-  cmake_pch_options := -DENABLE_UNIT_TESTS=OFF
-endif
-
 override_dh_auto_configure:
 	dh_auto_configure -- $(cmake_base_options) $(cmake_gl_options) $(cmake_pch_options)
 
@@ -46,7 +41,7 @@
 	find debian/tmp/usr/lib -name \*.*a -exec rm {} \;
 	rm -f debian/tmp/usr/share/compiz/networkarearegion.xml
 	rm -f debian/tmp//usr/lib/compiz/libnetworkarearegion.so
-	rm -rf debian/tmp/usr/share/gconf/schemas/ 
+	rm -rf debian/tmp/usr/share/gconf/schemas/
 	dh_install --fail-missing
 
 override_dh_gencontrol:
@@ -64,4 +59,4 @@
 endif
 
 %:
-	dh $@ --with translations,quilt,python2,migrations --parallel
+	dh $@ --with translations,quilt,python2,python3,migrations --parallel

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-10-16 08:46:03 +0000
+++ tests/CMakeLists.txt	2015-12-11 12:38:15 +0000
@@ -388,5 +388,5 @@
 # make target to allow devs to run "make autopilot" from build dir:
 set (AUTOPILOTDIR "${CMAKE_CURRENT_SOURCE_DIR}/autopilot")
 # Rules to install autopilot files and executable script:
-install(CODE "execute_process(COMMAND python setup.py install --prefix ${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${AUTOPILOTDIR})")
+install(CODE "execute_process(COMMAND python2.7 setup.py install --prefix ${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${AUTOPILOTDIR})")
 add_custom_target (autopilot COMMAND cd ${AUTOPILOTDIR} && make check)

=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2015-08-19 15:55:28 +0000
+++ tools/unity.cmake	2015-12-11 12:38:15 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2015 Canonical
 #
@@ -18,7 +18,6 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-import glib
 import glob
 from optparse import OptionParser
 import os
@@ -58,21 +57,21 @@
     '''set variable environnement for unity to run'''
 
     os.environ['COMPIZ_CONFIG_PROFILE'] = 'ubuntu'
-    
+
     if not 'DISPLAY' in os.environ:
         # take an optimistic chance and warn about it :)
-        print "WARNING: no DISPLAY variable set, setting it to :0"
+        print("WARNING: no DISPLAY variable set, setting it to :0")
         os.environ['DISPLAY'] = ':0'
 
 def reset_launcher_icons ():
     '''Reset the default launcher icon and restart it.'''
-    subprocess.Popen(["gsettings", "reset" ,"com.canonical.Unity.Launcher" , "favorites"]) 
+    subprocess.Popen(["gsettings", "reset" ,"com.canonical.Unity.Launcher" , "favorites"])
 
 def process_and_start_unity (verbose, debug_mode, compiz_path, compiz_args, log_file):
     '''launch unity under compiz (replace the current shell in any case)'''
-    
+
     cli = []
-    
+
     if debug_mode > 0:
         # we can do more check later as if it's in PATH...
         if not os.path.isfile('/usr/bin/gdb'):
@@ -85,7 +84,7 @@
             sys.exit(1)
         else:
             cli.extend(['gdb', '--args'])
-   
+
     if options.compiz_path:
         cli.extend([options.compiz_path, '--replace'])
     else:
@@ -95,7 +94,7 @@
         cli.append("--debug")
     if args:
         cli.extend(compiz_args)
-    
+
     if log_file:
         cli.extend(['2>&1', '|', 'tee', log_file])
 
@@ -119,7 +118,7 @@
     # In this case, we need a string and not a list
     # FIXME: still some bug with 2>&1 not showing everything before wait()
     return subprocess.Popen(" ".join(cli), env=dict(os.environ), shell=True)
-    
+
 
 def run_unity (verbose, debug, advanced_debug, compiz_path, compiz_args, log_file):
     '''run the unity shell and handle Ctrl + C'''
@@ -130,7 +129,7 @@
         unity_instance = process_and_start_unity (verbose, debug_mode, compiz_path, compiz_args, log_file)
         subprocess.call(["start", "unity-panel-service"])
         unity_instance.wait()
-    except KeyboardInterrupt, e:
+    except KeyboardInterrupt as e:
         try:
             os.kill(unity_instance.pid, signal.SIGKILL)
         except:
@@ -139,31 +138,31 @@
     sys.exit(unity_instance.returncode)
 
 def reset_to_distro():
-	''' remove all known default local installation path '''
-	
-	# check if we are root, we need to be root
-	if os.getuid() != 0:
-		print "Error: You need to be root to remove your local unity installation"
-		return 1
-	error = False
-	
-	for filedir in well_known_local_path:
-		for elem in glob.glob(filedir):
-			try:
-				shutil.rmtree(elem)
-			except OSError, e:
-				if os.path.isfile(elem) or os.path.islink(elem):
-					os.remove(elem)
-				else:
-					print "ERROR: Cannot remove %s: %s" % (elem, e)
-					error = True
-	
-	if error:
-		print "See above: some error happened and you should clean them before trying to restart unity"
-		return 1
-	else:
-		print "Unity local install cleaned, you can now restart unity"
-		return 0
+    ''' remove all known default local installation path '''
+
+    # check if we are root, we need to be root
+    if os.getuid() != 0:
+        print("Error: You need to be root to remove your local unity installation")
+        return 1
+    error = False
+
+    for filedir in well_known_local_path:
+        for elem in glob.glob(filedir):
+            try:
+                shutil.rmtree(elem)
+            except OSError as e:
+                if os.path.isfile(elem) or os.path.islink(elem):
+                    os.remove(elem)
+                else:
+                    print("ERROR: Cannot remove %s: %s" % (elem, e))
+                    error = True
+
+    if error:
+        print("See above: some error happened and you should clean them before trying to restart unity")
+        return 1
+    else:
+        print("Unity local install cleaned, you can now restart unity")
+        return 0
 
 if __name__ == '__main__':
     usage = "usage: %prog [options]"
@@ -176,7 +175,7 @@
     parser.add_option("--debug", action="store_true",
                       help="Run unity under gdb and print a backtrace on crash. /!\ Only if devs ask for it.")
     parser.add_option("--distro", action="store_true",
-                      help="Remove local build if present with default values to return to the package value (this doesn't run unity and need root access)")    
+                      help="Remove local build if present with default values to return to the package value (this doesn't run unity and need root access)")
     parser.add_option("--log", action="store",
                       help="Store log under filename.")
     parser.add_option("--replace", action="store_true",
@@ -184,7 +183,7 @@
     parser.add_option("--reset", action="store_true",
                       help="(deprecated: provided for backwards compatibility)")
     parser.add_option("--reset-icons", action="store_true",
-                      help="Reset the default launcher icon.")  
+                      help="Reset the default launcher icon.")
     parser.add_option("-v", "--verbose", action="store_true",
                       help="Get additional debug output from unity.")
     (options, args) = parser.parse_args()
@@ -192,15 +191,15 @@
     set_unity_env()
 
     if options.distro:
-		sys.exit(reset_to_distro())
+        sys.exit(reset_to_distro())
 
     if options.reset:
-	print ("The --reset option is deprecated, You should run with no options instead.")
- 
+        print ("The --reset option is deprecated, You should run with no options instead.")
+
     if options.reset_icons:
         reset_launcher_icons ()
-	
-	if options.replace:
-		print ("WARNING: This is for compatibility with other desktop interfaces please use unity without --replace")
-			
+
+    if options.replace:
+        print ("WARNING: This is for compatibility with other desktop interfaces please use unity without --replace")
+
     run_unity (options.verbose, options.debug, options.advanced_debug, options.compiz_path, args, options.log)