Merge remote-tracking branch 'buildbot/master' into uifixes

buildbot · Sep 2, 2014 · 34d4668 · 34d4668
2 parents 145b3e3 + 5a4ea1c
commit 34d4668
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/setup.py b/pkg/setup.py
@@ -19,7 +19,7 @@
 import buildbot_pkg
 
 setup(
-    name='buildbot_pkg',
+    name='buildbot-pkg',
     version=buildbot_pkg.getVersion("."),
     description='Buildbot packaging tools',
     author=u'Pierre Tardy',

diff --git a/www/base/setup.py b/www/base/setup.py
@@ -17,9 +17,9 @@
 
 try:
     from buildbot_pkg import setup_www_plugin
-    import mock, buildbot
+    import mock
+    import buildbot
 except ImportError:
-    from setuptools import  setup
     import sys
     print >> sys.stderr, "Please install buildbot, buildbot_pkg, and mock modules in order to install that package, or use the pre-build .whl modules available on pypi"
     sys.exit(1)