From c4bc42d527cf3d7fd3e432c626518c8e9ff15e8f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 10 Jan 2018 04:51:35 +0100
Subject: [PATCH] Upgrade keyring to 10.3.2 (#11531)
---
homeassistant/scripts/keyring.py | 10 +++++-----
requirements_all.txt | 5 ++++-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/homeassistant/scripts/keyring.py b/homeassistant/scripts/keyring.py
index e9eedeaa300..922bd9c7fe1 100644
--- a/homeassistant/scripts/keyring.py
+++ b/homeassistant/scripts/keyring.py
@@ -1,11 +1,11 @@
-"""Script to get, set, and delete secrets stored in the keyring."""
-import os
+"""Script to get, set and delete secrets stored in the keyring."""
import argparse
import getpass
+import os
from homeassistant.util.yaml import _SECRET_NAMESPACE
-REQUIREMENTS = ['keyring>=9.3,<10.0']
+REQUIREMENTS = ['keyring==10.3.2', 'keyrings.alt==2.3']
def run(args):
@@ -39,8 +39,8 @@ def run(args):
return 1
if args.action == 'set':
- the_secret = getpass.getpass('Please enter the secret for {}: '
- .format(args.name))
+ the_secret = getpass.getpass(
+ 'Please enter the secret for {}: '.format(args.name))
keyring.set_password(_SECRET_NAMESPACE, args.name, the_secret)
print('Secret {} set successfully'.format(args.name))
elif args.action == 'get':
diff --git a/requirements_all.txt b/requirements_all.txt
index 7a203df800c..e868cf68d58 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -416,7 +416,10 @@ jsonrpc-async==0.6
jsonrpc-websocket==0.5
# homeassistant.scripts.keyring
-keyring>=9.3,<10.0
+keyring==10.3.2
+
+# homeassistant.scripts.keyring
+keyrings.alt==2.3
# homeassistant.components.device_tracker.owntracks
# homeassistant.components.device_tracker.owntracks_http
--
GitLab