Fix failing pyup API key

- Update vendored safety package - Swap to blank pyup API key by default (but allow custom key) - Slightly improve safety revendoring - Fixes #4188 Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
pypa · Apr 17, 2020 · b4b5691 · b4b5691
1 parent 5c01c68
commit b4b5691
Show file tree

Hide file tree

Showing 15 changed files with 322 additions and 880 deletions.
diff --git a/news/4188.bugfix.rst b/news/4188.bugfix.rst
@@ -0,0 +1 @@
+Fixed an issue with ``pipenv check`` failing due to an invalid API key from ``pyup.io``.
diff --git a/pipenv/core.py b/pipenv/core.py
@@ -2644,9 +2644,10 @@ def do_check(
             err=True,
         )
     else:
-        ignored = ""
-    key = "--key={0}".format(PIPENV_PYUP_API_KEY)
-    cmd = _cmd + [safety_path, "check", "--json", key]
+        ignored = []
+    cmd = _cmd + [safety_path, "check", "--json"]
+    if PIPENV_PYUP_API_KEY:
+        cmd = cmd + ["--key={0}".format(PIPENV_PYUP_API_KEY)]
     if ignored:
         for cve in ignored:
             cmd += cve

diff --git a/pipenv/environments.py b/pipenv/environments.py
@@ -256,7 +256,7 @@ def _is_env_truthy(name):
 """
 
 PIPENV_PYUP_API_KEY = os.environ.get(
-    "PIPENV_PYUP_API_KEY", "1ab8d58f-5122e025-83674263-bc1e79e0"
+    "PIPENV_PYUP_API_KEY", None
 )
 
 # Internal, support running in a different Python from sys.executable.

diff --git a/pipenv/patched/safety/LICENSE → pipenv/patched/safety.LICENSE b/pipenv/patched/safety/LICENSE → pipenv/patched/safety.LICENSE
@@ -1,4 +1,3 @@
-
 MIT License
 
 Copyright (c) 2016, pyup.io

diff --git a/pipenv/patched/safety.zip b/pipenv/patched/safety.zip
diff --git a/pipenv/patched/safety/__init__.py b/pipenv/patched/safety/__init__.py
diff --git a/pipenv/patched/safety/__main__.py b/pipenv/patched/safety/__main__.py
diff --git a/pipenv/patched/safety/cli.py b/pipenv/patched/safety/cli.py
diff --git a/pipenv/patched/safety/constants.py b/pipenv/patched/safety/constants.py
diff --git a/pipenv/patched/safety/errors.py b/pipenv/patched/safety/errors.py