Bug 688296 python module conflicts with xcode module p=lsblakk r=catlee
authorLukas Blakk <lsblakk@mozilla.com>
Fri, 07 Oct 2011 15:21:08 -0700
changeset 1867 5d7275ae3207f56605dea4ec6d8f7e80abc063fa
parent 1866 29a930fe1eb676d6ef57cca6db7c1dfefc91b5ab
child 1868 f1ace66b1766d6c1390d576e5904ae480175ac87
push id1312
push userlsblakk@mozilla.com
push dateFri, 07 Oct 2011 22:21:20 +0000
reviewerscatlee
bugs688296
Bug 688296 python module conflicts with xcode module p=lsblakk r=catlee
buildbot-helpers/command_runner.py
buildbot-helpers/pulse_publisher.py
lib/python/buildtools/__init__.py
lib/python/buildtools/queuedir.py
lib/python/buildtools/test/__init__.py
lib/python/buildtools/test/init_hgrepo.sh
lib/python/buildtools/test/sample-update-verify.cfg
lib/python/buildtools/test/test_build_paths.py
lib/python/buildtools/test/test_build_versions.py
lib/python/buildtools/test/test_release_updates_verify.py
lib/python/buildtools/test/test_release_versions.py
lib/python/buildtools/test/test_util_algorithms.py
lib/python/buildtools/test/test_util_commands.py
lib/python/buildtools/test/test_util_file.py
lib/python/buildtools/test/test_util_hg.py
lib/python/buildtools/test/test_util_retry.py
lib/python/mozilla_buildtools/__init__.py
lib/python/mozilla_buildtools/queuedir.py
lib/python/mozilla_buildtools/test/__init__.py
lib/python/mozilla_buildtools/test/init_hgrepo.sh
lib/python/mozilla_buildtools/test/sample-update-verify.cfg
lib/python/mozilla_buildtools/test/test_build_paths.py
lib/python/mozilla_buildtools/test/test_build_versions.py
lib/python/mozilla_buildtools/test/test_release_updates_verify.py
lib/python/mozilla_buildtools/test/test_release_versions.py
lib/python/mozilla_buildtools/test/test_util_algorithms.py
lib/python/mozilla_buildtools/test/test_util_commands.py
lib/python/mozilla_buildtools/test/test_util_file.py
lib/python/mozilla_buildtools/test/test_util_hg.py
lib/python/mozilla_buildtools/test/test_util_retry.py
setup.py
--- a/buildbot-helpers/command_runner.py
+++ b/buildbot-helpers/command_runner.py
@@ -1,15 +1,15 @@
 #!/usr/bin/env python
 """
 Runs commands from a queue!
 """
 import subprocess, os, signal
 import time
-from buildtools.queuedir import QueueDir
+from mozilla_buildtools.queuedir import QueueDir
 from buildbot.util import json
 import logging
 log = logging.getLogger(__name__)
 
 class Job(object):
     def __init__(self, cmd, item_id, log_fp):
         self.cmd = cmd
         self.log = log_fp
--- a/buildbot-helpers/pulse_publisher.py
+++ b/buildbot-helpers/pulse_publisher.py
@@ -7,17 +7,17 @@ plugin
 
 see http://hg.mozilla.org/users/clegnitto_mozilla.com/mozillapulse/ for pulse
 code
 """
 import time
 from datetime import tzinfo, timedelta, datetime
 
 from mozillapulse.messages.build import BuildMessage
-from buildtools.queuedir import QueueDir
+from mozilla_buildtools.queuedir import QueueDir
 from buildbot.util import json
 
 import logging
 log = logging.getLogger(__name__)
 
 ZERO = timedelta(0)
 HOUR = timedelta(hours=1)
 
rename from lib/python/buildtools/__init__.py
rename to lib/python/mozilla_buildtools/__init__.py
rename from lib/python/buildtools/queuedir.py
rename to lib/python/mozilla_buildtools/queuedir.py
rename from lib/python/buildtools/test/__init__.py
rename to lib/python/mozilla_buildtools/test/__init__.py
rename from lib/python/buildtools/test/init_hgrepo.sh
rename to lib/python/mozilla_buildtools/test/init_hgrepo.sh
rename from lib/python/buildtools/test/sample-update-verify.cfg
rename to lib/python/mozilla_buildtools/test/sample-update-verify.cfg
rename from lib/python/buildtools/test/test_build_paths.py
rename to lib/python/mozilla_buildtools/test/test_build_paths.py
rename from lib/python/buildtools/test/test_build_versions.py
rename to lib/python/mozilla_buildtools/test/test_build_versions.py
rename from lib/python/buildtools/test/test_release_updates_verify.py
rename to lib/python/mozilla_buildtools/test/test_release_updates_verify.py
rename from lib/python/buildtools/test/test_release_versions.py
rename to lib/python/mozilla_buildtools/test/test_release_versions.py
rename from lib/python/buildtools/test/test_util_algorithms.py
rename to lib/python/mozilla_buildtools/test/test_util_algorithms.py
rename from lib/python/buildtools/test/test_util_commands.py
rename to lib/python/mozilla_buildtools/test/test_util_commands.py
rename from lib/python/buildtools/test/test_util_file.py
rename to lib/python/mozilla_buildtools/test/test_util_file.py
rename from lib/python/buildtools/test/test_util_hg.py
rename to lib/python/mozilla_buildtools/test/test_util_hg.py
rename from lib/python/buildtools/test/test_util_retry.py
rename to lib/python/mozilla_buildtools/test/test_util_retry.py
--- a/setup.py
+++ b/setup.py
@@ -10,17 +10,17 @@ setup(
     author_email = "release@mozilla.com",
 
     # python packages are under lib/python.  Note that there are several
     # top-level packages here -- not just a buildtools package
 
     packages = find_packages("lib/python"),
     package_dir = { '' : "lib/python" },
 
-    test_suite = 'buildtools.test',
+    test_suite = 'mozilla_buildtools.test',
 
     install_requires = [
         'sqlalchemy',
         'argparse',
         'twisted',
         'simplejson',
     ],