From bc2fb628cc21abe698c8a3b5105d2983952b0a46 Mon Sep 17 00:00:00 2001
From: Blake Harnden <32446120+bharnden@users.noreply.github.com>
Date: Fri, 24 Jan 2020 17:12:14 -0800
Subject: [PATCH] updates to Pipefiles, requirements.txt, and setup.py to
 account for addition of mako dependency

---
 daemon/Pipfile          |  1 -
 daemon/Pipfile.lock     | 25 ++++++++++++-------------
 daemon/requirements.txt | 14 ++++++++------
 daemon/setup.py.in      |  1 +
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/daemon/Pipfile b/daemon/Pipfile
index 63a1d240..d55b248f 100644
--- a/daemon/Pipfile
+++ b/daemon/Pipfile
@@ -21,4 +21,3 @@ mock = "*"
 
 [packages]
 core = {editable = true,path = "."}
-mako = "*"
diff --git a/daemon/Pipfile.lock b/daemon/Pipfile.lock
index aa6bcd51..b3cacedc 100644
--- a/daemon/Pipfile.lock
+++ b/daemon/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "3d8bcb3cbfddc5803b6f2309330c77e815b44ed81f42644f4d42b625e65b5d24"
+            "sha256": "d702e6eed5a1362bf261543572bbffd2e8a87140b8d8cb07b99fb0d25220a2b5"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -201,10 +201,9 @@
         },
         "mako": {
             "hashes": [
-                "sha256:a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b"
+                "sha256:2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4"
             ],
-            "index": "pypi",
-            "version": "==1.1.0"
+            "version": "==1.1.1"
         },
         "markupsafe": {
             "hashes": [
@@ -576,10 +575,10 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:aec3fdbb8bc9e4bb65f0634b9f551ced63983a529d6a8931817d52fdd0816ddb",
-                "sha256:fe1d8331dfa7cc0a883b49d75fc76380b2ab2734b220fbb87d774e4fd4b851f8"
+                "sha256:170748228214b70b672c581a3dd610ee51f733018650740e98c7df862a583f73",
+                "sha256:e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334"
             ],
-            "version": "==20.0"
+            "version": "==20.1"
         },
         "pluggy": {
             "hashes": [
@@ -649,11 +648,11 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:9f8d44f4722b3d06b41afaeb8d177cfbe0700f8351b1fc755dd27eedaa3eb9e0",
-                "sha256:f5d3d0e07333119fe7d4af4ce122362dc4053cdd34a71d2766290cf5369c64ad"
+                "sha256:1d122e8be54d1a709e56f82e2d85dcba3018313d64647f38a91aec88c239b600",
+                "sha256:c13d1943c63e599b98cf118fcb9703e4d7bde7caa9a432567bcdcae4bf512d20"
             ],
             "index": "pypi",
-            "version": "==5.3.3"
+            "version": "==5.3.4"
         },
         "pyyaml": {
             "hashes": [
@@ -701,10 +700,10 @@
         },
         "zipp": {
             "hashes": [
-                "sha256:8dda78f06bd1674bd8720df8a50bb47b6e1233c503a4eed8e7810686bde37656",
-                "sha256:d38fbe01bbf7a3593a32bc35a9c4453c32bc42b98c377f9bff7e9f8da157786c"
+                "sha256:b338014b9bc7102ca69e0fb96ed07215a8954d2989bc5d83658494ab2ba634af",
+                "sha256:e013e7800f60ec4dde789ebf4e9f7a54236e4bbf5df2a1a4e20ce9e1d9609d67"
             ],
-            "version": "==1.0.0"
+            "version": "==2.0.1"
         }
     }
 }
diff --git a/daemon/requirements.txt b/daemon/requirements.txt
index eaddd657..d0defc6b 100644
--- a/daemon/requirements.txt
+++ b/daemon/requirements.txt
@@ -3,13 +3,15 @@ cffi==1.13.2
 cryptography==2.8
 fabric==2.5.0
 grpcio==1.26.0
-invoke==1.3.0
+invoke==1.4.0
 lxml==4.4.2
+Mako==1.1.1
+MarkupSafe==1.1.1
 netaddr==0.7.19
 paramiko==2.7.1
-pillow==6.2.1
-protobuf==3.11.1
+Pillow==7.0.0
+protobuf==3.11.2
 pycparser==2.19
-pynacl==1.3.0
-pyyaml==5.2
-six==1.13.0
+PyNaCl==1.3.0
+PyYAML==5.3
+six==1.14.0
diff --git a/daemon/setup.py.in b/daemon/setup.py.in
index e0faf01d..bdef71ab 100644
--- a/daemon/setup.py.in
+++ b/daemon/setup.py.in
@@ -39,6 +39,7 @@ setup(
         "netaddr",
         "invoke",
         "lxml",
+        "mako",
         "pillow",
         "protobuf",
         "pyyaml",