From 729abbd6bf78e8a0d256204b92b9aede4c14af08 Mon Sep 17 00:00:00 2001
From: James Lu <james@overdrivenetworks.com>
Date: Mon, 24 Jun 2019 15:03:51 -0700
Subject: [PATCH] Update dependency definitions

- Make cachetools a hard dependency - closes #648
- Mark unidecode as an optional dependency for Relay - #561
---
 README.md | 5 +++--
 setup.py  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3315954..df1670b 100644
--- a/README.md
+++ b/README.md
@@ -42,9 +42,10 @@ If you are a developer and want to help make PyLink more portable, patches are w
 
     * Setuptools (`pip3 install setuptools`)
     * PyYAML (`pip3 install pyyaml`)
+    * cachetools (`pip3 install cachetools`)
     * *For hashed password support*: Passlib >= 1.7.0 (`pip3 install passlib`)
-    * *For better PID file tracking (i.e. removing stale PID files after a crash)*: psutil (`pip3 install psutil`)
-    * *For the servprotect plugin*: cachetools (`pip3 install cachetools`)
+    * *For Unicode support in Relay*: unidecode (`pip3 install Unidecode`)
+    * *For extended PID file tracking (i.e. removing stale PID files after a crash)*: psutil (`pip3 install psutil`)
 
 2) Clone the repository: `git clone https://github.com/jlu5/PyLink && cd PyLink`
 
diff --git a/setup.py b/setup.py
index b79b9c9..8f25db3 100644
--- a/setup.py
+++ b/setup.py
@@ -82,12 +82,12 @@ setup(
     ],
 
     keywords='IRC services relay',
-    install_requires=['pyyaml'],
+    install_requires=['pyyaml', 'cachetools'],
 
     extras_require={
         'password-hashing': ['passlib>=1.7.0'],
         'cron-support': ['psutil'],
-        'servprotect': ['cachetools'],
+        'relay-unicode': ['unidecode'],
     },
 
     # Folders (packages of code)