Imported Upstream version 0.6upstream/0.6upstream

9 files changed, 9 insertions, 145 deletions

diff --git a/PKG-INFO b/PKG-INFO
index 908071f..7a314e1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,7 +1,7 @@
 Metadata-Version: 1.1
 Name: lava-scheduler-tool
-Version: 0.5
-Summary: Command line utility for the LAVA scheduler
+Version: 0.6
+Summary: Command line utility for the LAVA scheduler (deprecated)
 Home-page: https://launchpad.net/lava-scheduler-tool
 Author: Linaro Validation Team
 Author-email: linaro-dev@lists.linaro.org
diff --git a/lava_scheduler_tool.egg-info/PKG-INFO b/lava_scheduler_tool.egg-info/PKG-INFO
index 908071f..7a314e1 100644
--- a/lava_scheduler_tool.egg-info/PKG-INFO
+++ b/lava_scheduler_tool.egg-info/PKG-INFO
@@ -1,7 +1,7 @@
 Metadata-Version: 1.1
 Name: lava-scheduler-tool
-Version: 0.5
-Summary: Command line utility for the LAVA scheduler
+Version: 0.6
+Summary: Command line utility for the LAVA scheduler (deprecated)
 Home-page: https://launchpad.net/lava-scheduler-tool
 Author: Linaro Validation Team
 Author-email: linaro-dev@lists.linaro.org
diff --git a/lava_scheduler_tool.egg-info/SOURCES.txt b/lava_scheduler_tool.egg-info/SOURCES.txt
index 1ad7dfb..646023b 100644
--- a/lava_scheduler_tool.egg-info/SOURCES.txt
+++ b/lava_scheduler_tool.egg-info/SOURCES.txt
@@ -2,12 +2,9 @@ COPYING
 MANIFEST.in
 setup.cfg
 setup.py
-lava_scheduler_tool/__init__.py
-lava_scheduler_tool/commands.py
 lava_scheduler_tool.egg-info/PKG-INFO
 lava_scheduler_tool.egg-info/SOURCES.txt
 lava_scheduler_tool.egg-info/dependency_links.txt
-lava_scheduler_tool.egg-info/entry_points.txt
 lava_scheduler_tool.egg-info/requires.txt
 lava_scheduler_tool.egg-info/top_level.txt
 lava_scheduler_tool.egg-info/zip-safe
\ No newline at end of file
diff --git a/lava_scheduler_tool.egg-info/entry_points.txt b/lava_scheduler_tool.egg-info/entry_points.txt
deleted file mode 100644
index 5b2fb49..0000000
--- a/lava_scheduler_tool.egg-info/entry_points.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-    [lava.commands]
-    scheduler = lava_scheduler_tool.commands:scheduler
-    [lava.scheduler.commands]
-    submit-job = lava_scheduler_tool.commands:submit_job
-    resubmit-job = lava_scheduler_tool.commands:resubmit_job
-    cancel-job = lava_scheduler_tool.commands:cancel_job
-    [lava_tool.commands]
-    submit-job = lava_scheduler_tool.commands:submit_job
-    resubmit-job = lava_scheduler_tool.commands:resubmit_job
-    cancel-job = lava_scheduler_tool.commands:cancel_job
-    
\ No newline at end of file
diff --git a/lava_scheduler_tool.egg-info/requires.txt b/lava_scheduler_tool.egg-info/requires.txt
index aa968ca..cf6a651 100644
--- a/lava_scheduler_tool.egg-info/requires.txt
+++ b/lava_scheduler_tool.egg-info/requires.txt
@@ -1 +1 @@
-lava-tool [auth] >= 0.4
\ No newline at end of file
+lava-tool >= 0.7.dev
\ No newline at end of file
diff --git a/lava_scheduler_tool.egg-info/top_level.txt b/lava_scheduler_tool.egg-info/top_level.txt
index ebf7302..8b13789 100644
--- a/lava_scheduler_tool.egg-info/top_level.txt
+++ b/lava_scheduler_tool.egg-info/top_level.txt
@@ -1 +1 @@
-lava_scheduler_tool
+
diff --git a/lava_scheduler_tool/__init__.py b/lava_scheduler_tool/__init__.py
deleted file mode 100644
index da90fd9..0000000
--- a/lava_scheduler_tool/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2010, 2011 Linaro Limited
-#
-# Author: Michael Hudson-Doyle <michael.hudson@linaro.org>
-#
-# This file is part of lava-scheduler-tool.
-#
-# lava-scheduler-tool 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-scheduler-tool 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-scheduler-tool.  If not, see <http://www.gnu.org/licenses/>.
-
-__version__ = (0, 5, 0, "final", 0)
diff --git a/lava_scheduler_tool/commands.py b/lava_scheduler_tool/commands.py
deleted file mode 100644
index 065fbf5..0000000
--- a/lava_scheduler_tool/commands.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (C) 2010, 2011 Linaro Limited
-#
-# Author: Michael Hudson-Doyle <michael.hudson@linaro.org>
-#
-# This file is part of lava-scheduler-tool.
-#
-# lava-scheduler-tool 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-scheduler-tool 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-scheduler-tool.  If not, see <http://www.gnu.org/licenses/>.
-
-import xmlrpclib
-
-from lava_tool.authtoken import AuthenticatingServerProxy, KeyringAuthBackend
-from lava.tool.command import Command, CommandGroup
-from lava.tool.errors import CommandError
-from lava.tool.commands import ExperimentalCommandMixIn
-
-
-class scheduler(CommandGroup):
-    """
-    Interact with LAVA Scheduler
-    """
-
-    namespace = "lava.scheduler.commands"
-
-
-class submit_job(ExperimentalCommandMixIn, Command):
-    """
-    Submit a job to lava-scheduler
-    """
-
-    @classmethod
-    def register_arguments(cls, parser):
-        super(submit_job, cls).register_arguments(parser)
-        parser.add_argument("SERVER")
-        parser.add_argument("JSON_FILE")
-
-    def invoke(self):
-        self.print_experimental_notice()
-        server = AuthenticatingServerProxy(
-            self.args.SERVER, auth_backend=KeyringAuthBackend())
-        with open(self.args.JSON_FILE, 'rb') as stream:
-            command_text = stream.read()
-        try:
-            job_id = server.scheduler.submit_job(command_text)
-        except xmlrpclib.Fault, e:
-            raise CommandError(str(e))
-        else:
-            print "submitted as job id:", job_id
-
-
-class resubmit_job(ExperimentalCommandMixIn, Command):
-
-    @classmethod
-    def register_arguments(self, parser):
-        parser.add_argument("SERVER")
-        parser.add_argument("JOB_ID", type=int)
-
-    def invoke(self):
-        self.print_experimental_notice()
-        server = AuthenticatingServerProxy(
-            self.args.SERVER, auth_backend=KeyringAuthBackend())
-        try:
-            job_id = server.scheduler.resubmit_job(self.args.JOB_ID)
-        except xmlrpclib.Fault, e:
-            raise CommandError(str(e))
-        else:
-            print "resubmitted as job id:", job_id
-
-
-class cancel_job(ExperimentalCommandMixIn, Command):
-
-    @classmethod
-    def register_arguments(self, parser):
-        parser.add_argument("SERVER")
-        parser.add_argument("JOB_ID", type=int)
-
-    def invoke(self):
-        self.print_experimental_notice()
-        server = AuthenticatingServerProxy(
-            self.args.SERVER, auth_backend=KeyringAuthBackend())
-        server.scheduler.cancel_job(self.args.JOB_ID)
diff --git a/setup.py b/setup.py
index 073b664..3d22c03 100755
--- a/setup.py
+++ b/setup.py
@@ -23,26 +23,14 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'lava-scheduler-tool',
-    version = ":versiontools:lava_scheduler_tool:__version__",
+    version = '0.6',
     author = "Linaro Validation Team",
     author_email = "linaro-dev@lists.linaro.org",
     packages = find_packages(),
-    description = "Command line utility for the LAVA scheduler",
+    description = "Command line utility for the LAVA scheduler (deprecated)",
     url='https://launchpad.net/lava-scheduler-tool',
 #    test_suite='lava_scheduler_tool.tests.test_suite',
     license="LGPLv3",
-    entry_points = """
-    [lava.commands]
-    scheduler = lava_scheduler_tool.commands:scheduler
-    [lava.scheduler.commands]
-    submit-job = lava_scheduler_tool.commands:submit_job
-    resubmit-job = lava_scheduler_tool.commands:resubmit_job
-    cancel-job = lava_scheduler_tool.commands:cancel_job
-    [lava_tool.commands]
-    submit-job = lava_scheduler_tool.commands:submit_job
-    resubmit-job = lava_scheduler_tool.commands:resubmit_job
-    cancel-job = lava_scheduler_tool.commands:cancel_job
-    """,
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
@@ -52,7 +40,7 @@ setup(
         "Programming Language :: Python :: 2.7",
         "Topic :: Software Development :: Testing",
     ],
-    install_requires=['lava-tool [auth] >= 0.4'],
+    install_requires=['lava-tool >= 0.7.dev'],
     setup_requires = ['versiontools >= 1.3.1'],
     zip_safe = True,
 )