diff mbox

[Branch,~linaro-validation/lava-dashboard/trunk] Rev 239: Merge 0.5.2 release changes

Message ID 20110705105623.7950.62909.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki July 5, 2011, 10:56 a.m. UTC
Merge authors:
  Zygmunt Krynicki (zkrynicki)
Related merge proposals:
  https://code.launchpad.net/~linaro-validation/lava-dashboard/release-0.5.2/+merge/66879
  proposed by: Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 239 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Tue 2011-07-05 12:53:33 +0200
message:
  Merge 0.5.2 release changes
removed:
  COPYING.LGPL-3
modified:
  .bzrignore
  MANIFEST.in
  dashboard_app/__init__.py
  dashboard_app/extension.py
  dashboard_app/tests/other/test_client.py
  setup.py


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

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

Patch

=== modified file '.bzrignore'
--- .bzrignore	2011-03-14 13:24:34 +0000
+++ .bzrignore	2011-07-01 14:06:02 +0000
@@ -1,5 +1,6 @@ 
+*.egg-info
 .coverage
-*.egg-info
-dashboard_server/development.db
+build
 dashboard_server/media/**
 dashboard_server/static/**
+dist

=== removed file 'COPYING.LGPL-3'
--- COPYING.LGPL-3	2010-09-22 08:51:55 +0000
+++ COPYING.LGPL-3	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@ 
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2011-05-25 11:04:01 +0000
+++ MANIFEST.in	2011-07-01 11:42:57 +0000
@@ -1,5 +1,4 @@ 
 include COPYING.AGPL-3 
-include COPYING.LGPL-3 
 include HACKING
 include INSTALL 
 include NEWS 

=== modified file 'dashboard_app/__init__.py'
--- dashboard_app/__init__.py	2011-06-23 10:03:56 +0000
+++ dashboard_app/__init__.py	2011-07-01 14:04:59 +0000
@@ -20,4 +20,4 @@ 
 Dashboard Application (package)
 """
 
-__version__ = (0, 5, 0, "final", 0)
+__version__ = (0, 5, 2, "final", 0)

=== modified file 'dashboard_app/extension.py'
--- dashboard_app/extension.py	2011-06-17 01:33:55 +0000
+++ dashboard_app/extension.py	2011-07-01 14:03:49 +0000
@@ -35,4 +35,9 @@ 
             'linaro_django_pagination.middleware.PaginationMiddleware')
         settings['RESTRUCTUREDTEXT_FILTER_SETTINGS'] = {
             "initial_header_level": 4}
-        # TODO: Add dataview database support
+
+    def contribute_to_settings_ex(self, settings_module, settings_object):
+        settings_module['DATAVIEW_DIRS'] = settings_object._settings.get(
+            "DATAVIEW_DIRS", [])
+        settings_module['DATAREPORT_DIRS'] = settings_object._settings.get(
+            "DATAREPORT_DIRS", [])

=== modified file 'dashboard_app/tests/other/test_client.py'
--- dashboard_app/tests/other/test_client.py	2011-05-30 17:43:28 +0000
+++ dashboard_app/tests/other/test_client.py	2011-07-01 13:07:40 +0000
@@ -36,9 +36,7 @@ 
 
 
 class local_urls:
-
-    from django.conf.urls.defaults import *
-
+    from django.conf.urls.defaults import patterns, url
     urlpatterns = patterns('', url(r'^auth-test/$', auth_test))
 
 

=== modified file 'setup.py'
--- setup.py	2011-06-23 18:36:03 +0000
+++ setup.py	2011-07-01 11:43:06 +0000
@@ -41,7 +41,6 @@ 
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU Affero General Public License v3",
-        "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
@@ -52,8 +51,8 @@ 
         'django-restricted-resource >= 0.2.6',
         'django-staticfiles == 0.3.4',
         'docutils >= 0.6',
-        'lava-server >= 0.1',
-        'linaro-dashboard-bundle >= 1.4',
+        'lava-server >= 0.2.1',
+        'linaro-dashboard-bundle >= 1.5.2',
         'linaro-django-pagination >= 2.0.2',
         'linaro-json >= 2.0.1',  # TODO: use json-schema-validator
         'pygments >= 1.2',