From patchwork Thu Mar 22 17:30:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 7416 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C66EF23E13 for ; Thu, 22 Mar 2012 17:30:23 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 71FBFA1831C for ; Thu, 22 Mar 2012 17:30:23 +0000 (UTC) Received: by iage36 with SMTP id e36so4469875iag.11 for ; Thu, 22 Mar 2012 10:30:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=DevnGsh5732b+jMOHZE0TzbZa5hyiaoUrb5C9DxgAT4=; b=hD1gjPN2kK86bsf0W116aGN7nYWbOiEp7RRpZcqxv6WsK65kk+AS8Bl7UGzvYPx/WM wD0HI/XNG7scLbBEssFa8l4mDivm13V/rppeKvM8Pfj2ei+fUEwNzudZpD25S83RBPH6 +dkcE8QCKe39KA4yfVfcNQRPTba+ihA7tRXWm811dk/znPbKSXNyKP7I5khGF+9BBjda Zog1MTUvgeWxDpbZQi63WP1Tp2GioKhfJNbD8sRYtUIqGFXf9HsVpc1GjjBa8SEIH0/A 7aLc4oMHfat20R7G0avxhMofebQhFUCy8+3z9kKUFbkwThKMX9vlbEwyNidrarp0pgPr ucjw== Received: by 10.50.155.229 with SMTP id vz5mr2658591igb.12.1332437420724; Thu, 22 Mar 2012 10:30:20 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.203.79 with SMTP id fh15csp2007ibb; Thu, 22 Mar 2012 10:30:20 -0700 (PDT) Received: by 10.180.107.101 with SMTP id hb5mr7222001wib.7.1332437419447; Thu, 22 Mar 2012 10:30:19 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id h60si5932741wed.51.2012.03.22.10.30.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 10:30:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SAlq6-00009I-Sh for ; Thu, 22 Mar 2012 17:30:18 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id CD82BE00BF for ; Thu, 22 Mar 2012 17:30:18 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-tool X-Launchpad-Branch: ~linaro-validation/lava-tool/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 171 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-tool/trunk] Rev 171: Merge no-auth branch that makes keyring entirely optional Message-Id: <20120322173018.4986.75174.launchpad@ackee.canonical.com> Date: Thu, 22 Mar 2012 17:30:18 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14981"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 1f4dc386af5e2b3ab4a0f034e93358bd877bfbc3 X-Gm-Message-State: ALoCoQmnzG+a95OFaIQmRSWOU9VXxxndgFpBKIMnqEYwxP0lP0TruPr3Uz02DDAwo+1mNsETwT5P Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-tool/no-auth/+merge/97288 proposed by: Zygmunt Krynicki (zkrynicki) review: Approve - Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 171 [merge] committer: Zygmunt Krynicki branch nick: release timestamp: Thu 2012-03-22 18:27:51 +0100 message: Merge no-auth branch that makes keyring entirely optional modified: lava/tool/dispatcher.py setup.py --- lp:lava-tool https://code.launchpad.net/~linaro-validation/lava-tool/trunk You are subscribed to branch lp:lava-tool. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-tool/trunk/+edit-subscription === modified file 'lava/tool/dispatcher.py' --- lava/tool/dispatcher.py 2012-03-13 18:22:16 +0000 +++ lava/tool/dispatcher.py 2012-03-13 19:12:47 +0000 @@ -66,7 +66,12 @@ """ logging.debug("Loading commands in entry point %r", entrypoint_name) for entrypoint in pkg_resources.iter_entry_points(entrypoint_name): - self.add_command_cls(entrypoint.load()) + try: + command_cls = entrypoint.load() + except (ImportError, pkg_resources.DistributionNotFound) as exc: + logging.debug("Unable to load %s: %r", entrypoint, exc) + else: + self.add_command_cls(command_cls) def add_command_cls(self, command_cls): """ === modified file 'setup.py' --- setup.py 2012-03-13 18:22:16 +0000 +++ setup.py 2012-03-13 19:13:08 +0000 @@ -40,7 +40,7 @@ help = lava.tool.commands.help:help [lava_tool.commands] help = lava.tool.commands.help:help - auth-add = lava_tool.commands.auth:auth_add + auth-add = lava_tool.commands.auth:auth_add [auth] """, classifiers=[ "Development Status :: 4 - Beta", @@ -52,11 +52,8 @@ "Programming Language :: Python :: 2.7", "Topic :: Software Development :: Testing", ], - install_requires=[ - 'argparse >= 1.1', - 'keyring'], - setup_requires=[ - 'versiontools >= 1.3.1'], - tests_require=[ - 'mocker >= 1.0'], + extras_require={'auth': ['keyring']}, + install_requires=['argparse >= 1.1'], + setup_requires=['versiontools >= 1.3.1'], + tests_require=['mocker >= 1.0'], zip_safe=True)