← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~allenap/maas/unbreak-daily-build into lp:maas

 

Gavin Panella has proposed merging lp:~allenap/maas/unbreak-daily-build into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1014433 in MAAS: "Daily build is broken"
  https://bugs.launchpad.net/maas/+bug/1014433

For more details, see:
https://code.launchpad.net/~allenap/maas/unbreak-daily-build/+merge/111389

In addition to ditching distribute_setup, I've also updated some of the package metadata.
-- 
https://code.launchpad.net/~allenap/maas/unbreak-daily-build/+merge/111389
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/unbreak-daily-build into lp:maas.
=== modified file 'setup.py'
--- setup.py	2012-06-15 13:56:11 +0000
+++ setup.py	2012-06-21 12:19:20 +0000
@@ -2,7 +2,7 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Distutils installer for maas."""
+"""Distribute/Setuptools installer for MAAS."""
 
 from __future__ import (
     absolute_import,
@@ -15,13 +15,6 @@
     join,
     )
 
-import distribute_setup
-
-# The version of distribute packaged in precise is not quite at 0.6.24
-# final yet so we need to override the required version here to stop a
-# recipe build from trying to download from pypi.
-distribute_setup.use_setuptools(version="0.6.24dev-r0")
-
 from setuptools import (
     find_packages,
     setup,
@@ -42,11 +35,11 @@
     version=__version__,
     url="https://launchpad.net/maas";,
     license="AGPLv3",
-    description="Metal as as Service",
+    description="Metal As A Service",
     long_description=read('README'),
 
     author="MAAS Developers",
-    author_email="juju@xxxxxxxxxxxxxxxx",
+    author_email="maas-devel@xxxxxxxxxxxxxxxx",
 
     packages=find_packages(
         where=b'src',