diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 358: Merge 0.11.1 relase branch

Message ID 20120328085014.3107.17022.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki March 28, 2012, 8:50 a.m. UTC
Merge authors:
  Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 358 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Wed 2012-03-28 10:48:18 +0200
message:
  Merge 0.11.1 relase branch
removed:
  lava/utils/interface/
  lava/utils/interface/__init__.py
modified:
  doc/changes.rst
  setup.py


--
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk

You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2012-03-13 20:49:34 +0000
+++ doc/changes.rst	2012-03-28 08:48:18 +0000
@@ -6,6 +6,15 @@ 
 Version 0.12 (UNRELEASED)
 =========================
 
+* Merge 0.11.1 release branch
+
+.. _version_0_11_1:
+
+Version 0.11.1
+==============
+
+* Drop a copy of lava-utils-interface and add a dependency on the external
+  module. This makes lava-server co-installable with lava-utils-interface 
 
 .. _version_0_11:
 

=== removed directory 'lava/utils/interface'
=== removed file 'lava/utils/interface/__init__.py'
--- lava/utils/interface/__init__.py	2012-01-17 01:18:34 +0000
+++ lava/utils/interface/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@ 
-# Copyright (C) 2012 Linaro Limited
-#
-# Author: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
-#
-# This file is part of LAVA Server.
-#
-# LAVA Server is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# as published by the Free Software Foundation
-#
-# LAVA Server is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with LAVA Server.  If not, see <http://www.gnu.org/licenses/>.
-
-from abc import ABCMeta, abstractmethod
-
-
-class Interface(object):
-    """
-    Interface class
-    """
-
-    __metaclass__ = ABCMeta

=== modified file 'setup.py'
--- setup.py	2012-01-17 01:29:55 +0000
+++ setup.py	2012-03-28 08:40:20 +0000
@@ -65,6 +65,7 @@ 
         'django-staticfiles == 0.3.4',
         'docutils >= 0.6',
         'lava-tool >= 0.2',
+        'lava-utils-interface >= 1.0',
         'linaro-django-xmlrpc >= 0.4',
         'python-openid >= 2.2.4',  # this should be a part of
                                    # django-openid-auth deps