Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/py-fixes into lp:ubuntuone-client

  1. py-fixes
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 1398
Merged at revision: 1398
Proposed branch: lp:~dobey/ubuntuone-client/py-fixes
Merge into: lp:ubuntuone-client
Diff against target: 85 lines (+19/-9)
4 files modified
run-tests (+1/-1)
run-tests.bat (+1/-1)
setup.py (+16/-7)
ubuntuone-client.pth (+1/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/py-fixes
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+168535@code.launchpad.net

Commit message

Move the reactor import check script to contrib, as a script.
Update the run-tests scripts for the change.
Add a .pth file.
Work around DistUtilsExtra.auto wanting to install everything with __init__.py.

Description of the change

This should hopefully fix the weird error occurring when the reactor import checker is run in the daily builds. The check works fine locally, and I don't see anything else that might cause it. So adding the .pth here, moving the script, and avoiding install of the contrib and tests directories as packages, should hopefully fix it.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

works on osx for me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'tests/platform/check_reactor_import.py' => 'contrib/check-reactor-import' (properties changed: -x to +x)
=== modified file 'run-tests'
--- run-tests 2013-06-07 17:42:06 +0000
+++ run-tests 2013-06-10 19:37:33 +0000
@@ -71,6 +71,6 @@
71rm -rf _trial_temp71rm -rf _trial_temp
72rm -rf build72rm -rf build
7373
74$PYTHON tests/platform/check_reactor_import.py74$PYTHON contrib/check-reactor-import
7575
76style_check76style_check
7777
=== modified file 'run-tests.bat'
--- run-tests.bat 2013-06-07 17:17:02 +0000
+++ run-tests.bat 2013-06-10 19:37:33 +0000
@@ -87,7 +87,7 @@
87ECHO Performing style checks...87ECHO Performing style checks...
88"%LINTPATH%"88"%LINTPATH%"
8989
90"%PYTHONEXEPATH%" tests\platform\check_reactor_import.py90"%PYTHONEXEPATH%" contrib\check-reactor-import
9191
92:: if pep8 is not present, move to the end92:: if pep8 is not present, move to the end
93IF EXIST "%PEP8PATH%" (93IF EXIST "%PEP8PATH%" (
9494
=== modified file 'setup.py'
--- setup.py 2013-06-07 15:31:52 +0000
+++ setup.py 2013-06-10 19:37:33 +0000
@@ -41,11 +41,6 @@
41assert DistUtilsExtra.auto.__version__ >= '2.18', \41assert DistUtilsExtra.auto.__version__ >= '2.18', \
42 'needs DistUtilsExtra.auto >= 2.18'42 'needs DistUtilsExtra.auto >= 2.18'
4343
44try:
45 from setuptools import find_packages
46except ImportError:
47 from distutils.core import find_packages
48
4944
50PROJECT_NAME = 'ubuntuone-client'45PROJECT_NAME = 'ubuntuone-client'
51VERSION = '13.05'46VERSION = '13.05'
@@ -98,6 +93,21 @@
98 @prefix@ by self.prefix.93 @prefix@ by self.prefix.
9994
100 """95 """
96
97 # Remove the contrib and tests packages from the packages list
98 # as they are not meant to be installed to the system.
99 i = 0
100 for pkg in self.distribution.packages:
101 print("Checking %s" % pkg)
102 if pkg.startswith('contrib'):
103 print('Removing %s' % pkg)
104 self.distribution.packages.pop(i)
105 if pkg.startswith('tests'):
106 print("Removing %s" % pkg)
107 self.distribution.packages.pop(i)
108
109 i += 1
110
101 # Get just the prefix value, without the root111 # Get just the prefix value, without the root
102 prefix = self.install_data.replace(112 prefix = self.install_data.replace(
103 self.root if self.root is not None else '', '')113 self.root if self.root is not None else '', '')
@@ -143,7 +153,7 @@
143153
144154
145class BuildLocale(build_i18n.build_i18n):155class BuildLocale(build_i18n.build_i18n):
146 """Workaround a bug in DistUtilsExtra."""156 """Work around a bug in DistUtilsExtra."""
147157
148 def run(self):158 def run(self):
149 """Magic."""159 """Magic."""
@@ -247,6 +257,5 @@
247 extra_path=PROJECT_NAME,257 extra_path=PROJECT_NAME,
248 scripts=scripts,258 scripts=scripts,
249 data_files=data_files,259 data_files=data_files,
250 packages=find_packages(),
251 cmdclass=cmdclass,260 cmdclass=cmdclass,
252 **extra)261 **extra)
253262
=== added file 'ubuntuone-client.pth'
--- ubuntuone-client.pth 1970-01-01 00:00:00 +0000
+++ ubuntuone-client.pth 2013-06-10 19:37:33 +0000
@@ -0,0 +1,1 @@
1ubuntuone-client

Subscribers

People subscribed via source and target branches