desktopcouch

Merge lp://qastaging/~dobey/desktopcouch/noautokthxbye into lp://qastaging/desktopcouch

  1. noautokthxbye
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Tim Cole
Approved revision: 30
Merged at revision: not available
Proposed branch: lp://qastaging/~dobey/desktopcouch/noautokthxbye
Merge into: lp://qastaging/desktopcouch
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~dobey/desktopcouch/noautokthxbye
Reviewer Review Type Date Requested Status
Tim Cole (community) Approve
John O'Brien (community) Approve
Review via email: mp+9897@code.qastaging.launchpad.net

Commit message

Don't use DistUtilsExtra.auto as it's only in Karmic, and doesn't help here

To post a comment you must log in.
Revision history for this message
John O'Brien (jdobrien) wrote :

I can't test this branch due to:

===============================================================================
[ERROR]: desktopcouch.records.tests.test_server

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/twisted/trial/runner.py", line 555, in loadPackage
    module = modinfo.load()
  File "/usr/lib/python2.6/dist-packages/twisted/python/modules.py", line 380, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/usr/lib/python2.6/dist-packages/twisted/python/reflect.py", line 456, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/home/john/canonical/ubuntuone/desktopcouch/noautokthxbye/desktopcouch/records/tests/test_server.py", line 21, in <module>
    import testtools, utils
exceptions.ImportError: No module named utils
-------------------------------------------------------------------------------

review: Abstain
Revision history for this message
John O'Brien (jdobrien) wrote :

Despite the fact that desktopcouch code is broken, I will approve this change.

review: Approve
Revision history for this message
Tim Cole (tcole) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2009-08-05 00:57:42 +0000
3+++ setup.py 2009-08-09 17:37:35 +0000
4@@ -17,13 +17,7 @@
5 # along with desktopcouch. If not, see <http://www.gnu.org/licenses/>.
6 """setup.py"""
7
8-# DistUtilsExtra.auto exists in karmic. If you need to build this package
9-# on jaunty, install the package from karmic.
10-
11-# pylint: disable-msg=E0611
12-# pylint: disable-msg=F0401
13-
14-from DistUtilsExtra.auto import setup
15+from setuptools import setup, find_packages
16
17 setup(
18 name='desktopcouch',
19@@ -33,6 +27,7 @@
20 license='LGPL-3',
21 author='Stuart Langridge',
22 author_email='stuart.langridge@canonical.com',
23+ packages=find_packages(),
24 data_files = [('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',
25 'bin/desktopcouch-stop']),
26 ('/usr/share/doc/python-desktopcouch-records/api/',

Subscribers

People subscribed via source and target branches