Quickly

Merge lp://staging/~quickly-committers/quickly/refactor-project-root3 into lp://staging/quickly

refactor-project-root3
Merge into trunk

Proposed by Tony Byrne on 2011-03-15

Status:	Merged
Merged at revision:	608
Proposed branch:	lp://staging/~quickly-committers/quickly/refactor-project-root3
Merge into:	lp://staging/quickly
Diff against target:	1819 lines (+634/-518) 30 files modified data/templates/ubuntu-application/create.py (+2/-2) data/templates/ubuntu-application/edit.py (+4/-2) data/templates/ubuntu-application/help/tutorial.xml (+1/-1) data/templates/ubuntu-application/internal/apportutils.py (+2/-2) data/templates/ubuntu-application/license.py (+4/-2) data/templates/ubuntu-application/project_root/bin/project_name (+2/-34) data/templates/ubuntu-application/project_root/python/Aboutcamel_case_nameDialog.py (+24/-0) data/templates/ubuntu-application/project_root/python/Preferencescamel_case_nameDialog.py (+51/-0) data/templates/ubuntu-application/project_root/python/__init__.py (+48/-0) data/templates/ubuntu-application/project_root/python/camel_case_nameWindow.py (+30/-0) data/templates/ubuntu-application/project_root/python_lib/AboutDialog.py (+7/-18) data/templates/ubuntu-application/project_root/python_lib/Builder.py (+8/-6) data/templates/ubuntu-application/project_root/python_lib/PreferencesDialog.py (+31/-35) data/templates/ubuntu-application/project_root/python_lib/Window.py (+23/-24) data/templates/ubuntu-application/project_root/python_lib/__init__.py (+13/-0) data/templates/ubuntu-application/project_root/python_lib/helpers.py (+30/-16) data/templates/ubuntu-application/project_root/python_lib/preferences.py (+1/-6) data/templates/ubuntu-application/project_root/python_lib/python_nameconfig.py (+4/-0) data/templates/ubuntu-application/project_root/setup.py (+2/-2) data/templates/ubuntu-application/store/python/dialog_camel_case_nameDialog.py (+1/-4) data/templates/ubuntu-application/store/python/indicator.py (+3/-4) data/templates/ubuntu-application/test/apport/apport.sh (+27/-27) data/templates/ubuntu-application/test/builder/builder.py (+4/-4) data/templates/ubuntu-application/test/filelist.sh (+10/-5) data/templates/ubuntu-application/test/preferences.py (+5/-3) data/templates/ubuntu-cli/project_root/bin/project_name (+2/-44) data/templates/ubuntu-cli/project_root/python/__init__.py (+48/-0) data/templates/ubuntu-pygame/project_root/bin/project_name (+2/-237) data/templates/ubuntu-pygame/project_root/python/__init__.py (+237/-0) quickly/launchpadaccess.py (+8/-40)
To merge this branch:	bzr merge lp://staging/~quickly-committers/quickly/refactor-project-root3
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Quickly Developers		2011-03-15	Pending
Review via email: mp+53539@code.staging.launchpad.net

Description of the change

Put launchpad integration and application indicator back into python_lib instead of user code.
Fixed application indicator bug.

Note: needs unit tests, some are impossible for me as they are now natty specific.

lp://staging/~quickly-committers/quickly/refactor-project-root3 updated on 2011-03-31

604. By Michael Terry on 2011-03-31: merge from trunk
605. By Michael Terry on 2011-03-31: use implicit relative imports for intra-python_lib imports to avoid issues with the test suite
606. By Michael Terry on 2011-03-31: merge in launchpadlib changes for ease of validating test suite
607. By Michael Terry on 2011-03-31: whoops, undo accidental __quickly_data_directory__ reset
608. By Michael Terry on 2011-03-31: make relative imports super-explicit so that python-distutils-extra can know to skip them when scanning
609. By Michael Terry on 2011-03-31: change apport test to point at new Window.py
610. By Michael Terry on 2011-03-31: more robust .pyc cleaning after running preferences unit test

Revision history for this message

Michael Terry (mterry) wrote on 2011-03-31:

OK, test suite passes in natty now, assuming one has the fix for bug 746565.

I think this is looking in good shape! I'm going to do some more testing, but seems good so far. I'd like to land this for the post-11.04-beta quickly release.

lp://staging/~quickly-committers/quickly/refactor-project-root3 updated on 2011-04-01

611. By Michael Terry on 2011-03-31: merge from trunk again
612. By Michael Terry on 2011-04-01: some fixes noticed when updating tutorial
613. By Michael Terry on 2011-04-01: merge from trunk (tutorial refresh)