Merge lp://qastaging/~muktupavels/compiz/ccsm-python3 into lp://qastaging/compiz/0.9.13

Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4187
Merged at revision: 4190
Proposed branch: lp://qastaging/~muktupavels/compiz/ccsm-python3
Merge into: lp://qastaging/compiz/0.9.13
Diff against target: 560 lines (+88/-132)
18 files modified
compizconfig/ccsm/CMakeLists.txt (+7/-11)
compizconfig/ccsm/ccsm (+1/-1)
compizconfig/ccsm/setup.cfg (+2/-0)
compizconfig/ccsm/setup.py (+10/-10)
compizconfig/cmake/exec_setup_py_with_destdir.cmake (+2/-1)
compizconfig/compizconfig-python/CMakeLists.txt (+9/-30)
compizconfig/compizconfig-python/compizconfig-python.pc.in (+0/-13)
compizconfig/compizconfig-python/setup.py (+2/-3)
compizconfig/compizconfig-python/src/compizconfig.pyx (+4/-3)
compizconfig/compizconfig-python/tests/test_backend.py (+9/-9)
compizconfig/compizconfig-python/tests/test_plugin.py (+10/-10)
compizconfig/compizconfig-python/tests/test_setting.py (+14/-14)
debian/compizconfig-settings-manager.install (+1/-2)
debian/control (+14/-14)
debian/python-compizconfig.install (+0/-3)
debian/python-compizconfig.lintian-overrides (+0/-1)
debian/python3-compizconfig.install (+2/-0)
debian/rules (+1/-7)
To merge this branch: bzr merge lp://qastaging/~muktupavels/compiz/ccsm-python3
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Review via email: mp+351940@code.qastaging.launchpad.net

Commit message

Port CCSM to Python 3.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

The code changes look good to me.

Wuth regards to debian packaging, I have not tested it yet but added some comments anyway.

review: Needs Fixing
4183. By Alberts Muktupāvels

Port CCSM to Python 3.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

The packaging is fine now. For those who want to test it, it’s available in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3336.

Note that it will need a no-change rebuild for Python default version change (e.g. 3.6 → 3.7).

review: Approve
Revision history for this message
Dmitry Shachnev (mitya57) :
4184. By Alberts Muktupāvels

Remove python3-compizconfig.lintian-overrides.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

Is this safe for unity? I didn't find anything related. But did you speak with 3v1n0?

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Why would it be unsafe? I don't see what problems this could cause except for regressions in ccsm because of python2 -> python3 and/or gtk 2 -> gtk 3, and/or pygtk to pygobject.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM. Still need to run this. Could you please take a look to the only line-comment?

Revision history for this message
Dmitry Shachnev (mitya57) :
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Would it make sense to rename compizconfig-python.pc into compizconfig-python3.pc? This way you would not need to break/replace it because the two new packages will not conflict. @3v1n0 what do you think?

4185. By Alberts Muktupāvels

Rename compizconfig-python.pc to compizconfig-python3.pc and remove Breaks/Replaces.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

I think the .pc file for Python is just not needed, nothing is using it now.

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

compizconfig-python3.pc:
prefix=/usr
exec_prefix=/usr/bin
libdir=/usr/lib/x86_64-linux-gnu
includedir=/usr/include
pyexecdir=

Name: compizconfig-python3
Version: 0.9.13.1
Description: Compiz configuration system bindings

Requires:
Libs: -L/usr/lib/x86_64-linux-gnu -lcompizconfig
Cflags: -I/usr/include/compizconfig

libcompizconfig.pc:
prefix=/usr
exec_prefix=/usr/bin
libdir=/usr/lib/x86_64-linux-gnu
includedir=/usr/include/compizconfig

Name: libcompizconfig
Description: Compiz configuration system
Version: 0.9.13.1

Requires: compiz
Libs: -L/usr/lib/x86_64-linux-gnu -lcompizconfig
Cflags: -I/usr/include/compizconfig

Both files would find libcompizconfig.so that is installed by libcompizconfig0-dev. Seems useless file to me.

4186. By Alberts Muktupāvels

Remove compizconfig-python3.pc.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

Changes looks good to me now. You need to propose a change for unity-autopilot too in order to get this accepted. Also a FFE is required (https://wiki.ubuntu.com/FreezeExceptionProcess)

Revision history for this message
Andrea Azzarone (azzar1) wrote :

unity-autopilot is python2 code. You have two options here:
1) have both python-compizconfig and python3-compizconfig
2) port unity-autopilot to python3 (tbh I'm not sure how much work this would be)

4187. By Alberts Muktupāvels

Fix inconsistent use of tabs and spaces in indentation.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

unity-autopilot is ported in https://code.launchpad.net/~muktupavels/unity/+git/unity/+merge/359969. We finally got the tests to pass on all architectures, so let's ship it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches