Merge lp:~pitti/ubiquity/pygobject-fixes into lp:ubiquity
Status: | Merged |
---|---|
Merged at revision: | 5773 |
Proposed branch: | lp:~pitti/ubiquity/pygobject-fixes |
Merge into: | lp:ubiquity |
Diff against target: |
429 lines (+70/-62) 12 files modified
bin/oem-config-remove-gtk (+2/-2) bin/ubiquity-bluetooth-agent (+3/-3) debian/changelog (+8/-0) tests/test_timezone.py (+4/-4) ubiquity/frontend/gtk_ui.py (+12/-12) ubiquity/frontend/noninteractive.py (+7/-7) ubiquity/gtkwidgets.py (+5/-5) ubiquity/nm.py (+5/-5) ubiquity/plugins/ubi-console-setup.py (+6/-6) ubiquity/plugins/ubi-language.py (+3/-3) ubiquity/plugins/ubi-timezone.py (+8/-8) ubiquity/plugins/ubi-usersetup.py (+7/-7) |
To merge this branch: | bzr merge lp:~pitti/ubiquity/pygobject-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dimitri John Ledkov | Approve | ||
Review via email: mp+136327@code.launchpad.net |
Description of the change
This branch fixes ubiquity to work with current pygobject (see current autopkgtest failure in -proposed), and fixes some long-deprecated API which pygobject 3.7.x now triggers warnings for.
Note that I get two test failures locally:
ERROR: test_interface_
-------
Traceback (most recent call last):
File "/home/
% missing_
Exception: Missing translation for:
question_label, ubi_question_dialog
=======
FAIL: test_windows_only (test_ubi_
-------
Traceback (most recent call last):
File "/home/
self.
AssertionError: 'resize' not found in {'manual': PartitioningOpt
-------
These happen with the old and new pygobject, and with and without the branch.
They might be a local problem on my checkout/
tell anything to you?
Fixed the two test suite failures that I have introduced in 5771, sorry for hassle.
I had to fix the pep8 & pyflakes warnings from your merge proposal. Next time, please run ./test/run-pep8 & ./test/run-pyflakes as well. (they are run as part part of clean target, as well as the shell syntax checks).
Merged.