Merge branch 'master' into python38-migration

I have resolved a merge conflict in Pipfile.lock by relocking with the newly added dependencies of `coloredlogs` and `colorama`.

1 files changed, 2 insertions, 0 deletions

diff --git a/Pipfile b/Pipfile
index e08b5b41d..9ac32886a 100644
--- a/Pipfile
+++ b/Pipfile
@@ -19,6 +19,8 @@ requests = "~=2.22"
 more_itertools = "~=7.2"
 urllib3 = ">=1.24.2,<1.25"
 sentry-sdk = "~=0.14"
+coloredlogs = "~=14.0"
+colorama = {version = "~=0.4.3", sys_platform = "== 'win32'"}
 
 [dev-packages]
 coverage = "~=4.5"