From 0bd14488bb71a5a1984d7a7d61e225421fe4efe5 Mon Sep 17 00:00:00 2001
From: Curtis Castrapel <ccastrapel@netflix.com>
Date: Tue, 8 May 2018 15:35:03 -0700
Subject: [PATCH] Update requirements, handle more lemur_acme exceptions, and
 remove take a tour button

---
 lemur/plugins/lemur_acme/plugin.py            | 2 +-
 lemur/static/app/angular/welcome/welcome.html | 1 -
 requirements-dev.txt                          | 4 ++--
 requirements-tests.txt                        | 4 ++--
 requirements.txt                              | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lemur/plugins/lemur_acme/plugin.py b/lemur/plugins/lemur_acme/plugin.py
index 5321997c..4b93544d 100644
--- a/lemur/plugins/lemur_acme/plugin.py
+++ b/lemur/plugins/lemur_acme/plugin.py
@@ -304,7 +304,7 @@ class ACMEIssuerPlugin(IssuerPlugin):
                     "cert": cert,
                     "pending_cert": entry["pending_cert"],
                 })
-            except (PollError, AcmeError):
+            except (PollError, AcmeError, Exception):
                 current_app.logger.error("Unable to resolve pending cert: {}".format(pending_cert), exc_info=True)
                 certs.append({
                     "cert": False,
diff --git a/lemur/static/app/angular/welcome/welcome.html b/lemur/static/app/angular/welcome/welcome.html
index 99b9a803..de05f386 100644
--- a/lemur/static/app/angular/welcome/welcome.html
+++ b/lemur/static/app/angular/welcome/welcome.html
@@ -1,5 +1,4 @@
 <div class="jumbotron">
-  <span class="pull-right"><button class="btn btn-sm btn-primary">First Time? Take the Tour!</button></span>
   <h1>Hey there!</h1>
   <p>Welcome to Lemur! A central portal for all (most) of your TLS certificate needs. With Lemur you are able to create, deploy and track the TLS certificates in your environment. Lets get started!</p>
 </div>
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 36d90b53..f8460523 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -10,7 +10,7 @@ certifi==2018.4.16        # via requests
 cfgv==1.0.0               # via pre-commit
 chardet==3.0.4            # via requests
 flake8==3.5.0
-identify==1.0.15          # via pre-commit
+identify==1.0.16          # via pre-commit
 idna==2.6                 # via requests
 invoke==0.23.0
 mccabe==0.6.1             # via flake8
@@ -23,7 +23,7 @@ pyyaml==3.12              # via aspy.yaml, pre-commit
 requests-toolbelt==0.8.0  # via twine
 requests==2.18.4          # via requests-toolbelt, twine
 six==1.11.0               # via cfgv, pre-commit
-tqdm==4.23.2              # via twine
+tqdm==4.23.3              # via twine
 twine==1.11.0
 urllib3==1.22             # via requests
 virtualenv==15.2.0        # via pre-commit
diff --git a/requirements-tests.txt b/requirements-tests.txt
index f1736305..9d64116f 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -7,9 +7,9 @@
 asn1crypto==0.24.0        # via cryptography
 attrs==18.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-boto3==1.7.14             # via moto
+boto3==1.7.16             # via moto
 boto==2.48.0              # via moto
-botocore==1.10.14         # via boto3, moto, s3transfer
+botocore==1.10.16         # via boto3, moto, s3transfer
 certifi==2018.4.16        # via requests
 cffi==1.11.5              # via cryptography
 chardet==3.0.4            # via requests
diff --git a/requirements.txt b/requirements.txt
index 73bda8b9..9523c4f6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,8 +13,8 @@ asn1crypto==0.24.0        # via cryptography
 asyncpool==1.0
 bcrypt==3.1.4             # via flask-bcrypt, paramiko
 blinker==1.4              # via flask-mail, flask-principal, raven
-boto3==1.7.14
-botocore==1.10.14         # via boto3, s3transfer
+boto3==1.7.16
+botocore==1.10.16         # via boto3, s3transfer
 certifi==2018.4.16
 cffi==1.11.5              # via bcrypt, cryptography, pynacl
 click==6.7                # via flask