From cf6eec328976eca14d03c723864a1f001c04e6a1 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Sun, 2 Aug 2020 19:31:20 +0100
Subject: [PATCH] Removed keyring dependency

This remove all dependencies on the keyring lib, updates the
requirements.txt to reflect that, and ensures that setup.py does not
attempt to package it.

Any use of the "old" keyring code will now return None and warn about
its deprecation.
---
 config.py        | 19 ++++---------------
 requirements.txt |  3 +--
 setup.py         |  2 --
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/config.py b/config.py
index f6ad1acf..b0b887ec 100644
--- a/config.py
+++ b/config.py
@@ -1,5 +1,6 @@
 import numbers
 import sys
+import warnings
 from os import getenv, makedirs, mkdir, pardir
 from os.path import expanduser, dirname, exists, isdir, join, normpath
 from sys import platform
@@ -367,25 +368,13 @@ class Config(object):
     # Common
 
     def get_password(self, account):
-        try:
-            import keyring
-            return keyring.get_password(self.identifier, account)
-        except ImportError:
-            return None
+        warnings.warn("password subsystem is no longer supported", DeprecationWarning)
 
     def set_password(self, account, password):
-        try:
-            import keyring
-            keyring.set_password(self.identifier, account, password)
-        except ImportError:
-            pass
+        warnings.warn("password subsystem is no longer supported", DeprecationWarning)
 
     def delete_password(self, account):
-        try:
-            import keyring
-            keyring.delete_password(self.identifier, account)
-        except:
-            pass	# don't care - silently fail
+        warnings.warn("password subsystem is no longer supported", DeprecationWarning)
 
 # singleton
 config = Config()
diff --git a/requirements.txt b/requirements.txt
index 2327e183..4887f10a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 certifi==2019.9.11
-keyring==19.2.0
-pathtools>=0.1.2
 requests>=2.11.1
 watchdog>=0.8.3
+semantic-version>=2.8.5
diff --git a/setup.py b/setup.py
index be40d655..6bf35f8e 100755
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,6 @@ if sys.platform=='darwin':
                   'optimize': 2,
                   'packages': [
                       'requests',
-                      'keyring.backends',
                       'sqlite3',	# Included for plugins
                   ],
                   'includes': [
@@ -119,7 +118,6 @@ elif sys.platform=='win32':
                   'optimize': 2,
                   'packages': [
                       'requests',
-                      'keyring.backends',
                       'sqlite3',	# Included for plugins
                   ],
                   'includes': [