From 863f99eaece2612f3817780a084a3486d9cf4748 Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <33516116+SebastiaanZ@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:00:55 +0100
Subject: Make Azure CI use Python 3.8 and Ubuntu 18.04

Since the bot is now using Python 3.8 and some of our dependencies have Python-version specfic dependencies, it's important that the CI, which installs from our Pipfile, uses the same version of Python.
---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 874364a6f..35dea089a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,7 +9,7 @@ jobs:
   - job: test
     displayName: 'Lint & Test'
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
 
     variables:
       PIP_CACHE_DIR: ".cache/pip"
@@ -18,7 +18,7 @@ jobs:
       - task: UsePythonVersion@0
         displayName: 'Set Python version'
         inputs:
-          versionSpec: '3.7.x'
+          versionSpec: '3.8.x'
           addToPath: true
 
       - script: pip install pipenv
-- 
cgit v1.2.3


From 3b65766cf8fe095b91556efa49fabffefce5d49e Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 2 Mar 2020 10:36:02 -0800
Subject: Use pre-commit in pipenv lint script

---
 .pre-commit-config.yaml |  2 +-
 Pipfile                 |  2 +-
 azure-pipelines.yml     | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'azure-pipelines.yml')

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4bb5e7e1c..f369fb7d1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: flake8
         name: Flake8
         description: This hook runs flake8 within our project's pipenv environment.
-        entry: pipenv run lint
+        entry: pipenv run flake8
         language: python
         types: [python]
         require_serial: true
diff --git a/Pipfile b/Pipfile
index 64760f9dd..decc13e33 100644
--- a/Pipfile
+++ b/Pipfile
@@ -41,7 +41,7 @@ python_version = "3.8"
 
 [scripts]
 start = "python -m bot"
-lint = "python -m flake8"
+lint = "pre-commit run --all-files"
 precommit = "pre-commit install"
 build = "docker build -t pythondiscord/bot:latest -f Dockerfile ."
 push = "docker push pythondiscord/bot:latest"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 35dea089a..902bfcd56 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,10 +13,12 @@ jobs:
 
     variables:
       PIP_CACHE_DIR: ".cache/pip"
+      PRE_COMMIT_HOME: $(Pipeline.Workspace)/pre-commit-cache
 
     steps:
       - task: UsePythonVersion@0
         displayName: 'Set Python version'
+        name: PythonVersion
         inputs:
           versionSpec: '3.8.x'
           addToPath: true
@@ -27,8 +29,14 @@ jobs:
       - script: pipenv install --dev --deploy --system
         displayName: 'Install project using pipenv'
 
-      - script: python -m flake8
-        displayName: 'Run linter'
+      - task: Cache@2
+        displayName: 'Restore pre-commit environment'
+        inputs:
+          key: pre-commit | .pre-commit-config.yaml | "$(PythonVersion.pythonLocation)"
+          path: $(PRE_COMMIT_HOME)
+
+      - script: pre-commit run --all-files --show-diff-on-failure
+        displayName: 'Run pre-commit hooks'
 
       - script: BOT_API_KEY=foo BOT_SENTRY_DSN=blah BOT_TOKEN=bar WOLFRAM_API_KEY=baz REDDIT_CLIENT_ID=spam REDDIT_SECRET=ham coverage run -m xmlrunner
         displayName: Run tests
-- 
cgit v1.2.3


From f5b5298bbe77c52ae0d8b01b3c44fc22cdce35c3 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 2 Mar 2020 19:33:13 -0800
Subject: CI: add a restore key for the pre-commit cache

A cache for an outdated pre-commit environment may still be useful. It
may be the case that only some hooks need to be updated rather than
all.
---
 azure-pipelines.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 902bfcd56..fa85e6045 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -32,7 +32,9 @@ jobs:
       - task: Cache@2
         displayName: 'Restore pre-commit environment'
         inputs:
-          key: pre-commit | .pre-commit-config.yaml | "$(PythonVersion.pythonLocation)"
+          key: pre-commit | "$(PythonVersion.pythonLocation)" | .pre-commit-config.yaml
+          restoreKeys: |
+            pre-commit | "$(PythonVersion.pythonLocation)"
           path: $(PRE_COMMIT_HOME)
 
       - script: pre-commit run --all-files --show-diff-on-failure
-- 
cgit v1.2.3


From 93f29f8bfee77957770dab3dd9adc1dac62d0bb2 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Tue, 3 Mar 2020 19:45:46 -0800
Subject: CI: mock the pipenv binary

The mock gets used by the flake8 pre-commit hook, which invokes flake8
via `pipenv run flake8`. It's normally useful to use pipenv here cause
it ensures flake8 is invoked within the context of the venv. However, in
CI, there is no venv - dependencies are installed directly to the
system site-packages. `pipenv run` does not work in such case because it
tries to create a new venv if one doesn't exist (it doesn't consider the
system interpreter to be a venv).

This workaround (okay, it's a hack) creates an executable shell script
which replaces the original pipenv binary. The shell script simply
ignores the first argument (i.e. ignores `run` in `pipenv run`) and
executes the rest of the arguments as a command. It essentially makes
`pipenv run flake8` equivalent to just having ran `flake8`. When
pre-commit executes pipenv, the aforementioned script is what will run.
---
 azure-pipelines.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fa85e6045..280f11a36 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,6 +29,16 @@ jobs:
       - script: pipenv install --dev --deploy --system
         displayName: 'Install project using pipenv'
 
+      # Create an executable shell script which replaces the original pipenv binary.
+      # The shell script ignores the first argument and executes the rest of the args as a command.
+      # It makes the `pipenv run flake8` command in the pre-commit hook work by circumventing
+      # pipenv entirely, which is too dumb to know it should use the system interpreter rather than
+      # creating a new venv.
+      - script: |
+          printf '%s\n%s' '#!/bin/bash' '"${@:2}"' > $(PythonVersion.pythonLocation)/bin/pipenv \
+          && chmod +x $(PythonVersion.pythonLocation)/bin/pipenv
+        displayName: 'Mock pipenv binary'
+
       - task: Cache@2
         displayName: 'Restore pre-commit environment'
         inputs:
-- 
cgit v1.2.3


From 8769cfcfd85e2137992e1e34df214936b1ed9425 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Thu, 5 Mar 2020 09:04:46 -0800
Subject: CI: don't show diff after pre-commit hooks

It's noisy, messy output. It's not of much benefit anyway as users can
run git diff locally if they really need to see a diff. They have to do
work locally anyway since CI won't commit the fixes pre-commit makes.
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 280f11a36..16d1b7a2a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -47,7 +47,7 @@ jobs:
             pre-commit | "$(PythonVersion.pythonLocation)"
           path: $(PRE_COMMIT_HOME)
 
-      - script: pre-commit run --all-files --show-diff-on-failure
+      - script: pre-commit run --all-files
         displayName: 'Run pre-commit hooks'
 
       - script: BOT_API_KEY=foo BOT_SENTRY_DSN=blah BOT_TOKEN=bar WOLFRAM_API_KEY=baz REDDIT_CLIENT_ID=spam REDDIT_SECRET=ham coverage run -m xmlrunner
-- 
cgit v1.2.3


From 8e98a48420be718973b9a5b8aec83d4133ddc6e9 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Tue, 3 Mar 2020 08:32:57 -0800
Subject: CI: make env vars used for coverage into pipeline variables

Makes the script for the coverage step cleaner.
---
 azure-pipelines.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 16d1b7a2a..d97a13659 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,6 +14,12 @@ jobs:
     variables:
       PIP_CACHE_DIR: ".cache/pip"
       PRE_COMMIT_HOME: $(Pipeline.Workspace)/pre-commit-cache
+      BOT_API_KEY: foo
+      BOT_SENTRY_DSN: blah
+      BOT_TOKEN: bar
+      REDDIT_CLIENT_ID: spam
+      REDDIT_SECRET: ham
+      WOLFRAM_API_KEY: baz
 
     steps:
       - task: UsePythonVersion@0
@@ -50,7 +56,7 @@ jobs:
       - script: pre-commit run --all-files
         displayName: 'Run pre-commit hooks'
 
-      - script: BOT_API_KEY=foo BOT_SENTRY_DSN=blah BOT_TOKEN=bar WOLFRAM_API_KEY=baz REDDIT_CLIENT_ID=spam REDDIT_SECRET=ham coverage run -m xmlrunner
+      - script: coverage run -m xmlrunner
         displayName: Run tests
 
       - script: coverage report -m && coverage xml -o coverage.xml
-- 
cgit v1.2.3


From 5e315135e8b33658c19de7c249adefe33f79443f Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 2 Mar 2020 19:48:49 -0800
Subject: CI: cache Python dependencies

Reduces frequency of using pipenv to install dependencies in CI. Works
by caching the entire Python directory. Only a full cache hit will
skip the pipenv steps; a partial cache hit will still be followed by
using pipenv to install from the pipfiles.

* Disable pip cache
---
 azure-pipelines.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d97a13659..d7cf03aae 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,7 @@
 # https://aka.ms/yaml
 
 variables:
+  PIP_NO_CACHE_DIR: false
   PIPENV_HIDE_EMOJIS: 1
   PIPENV_IGNORE_VIRTUALENVS: 1
   PIPENV_NOSPIN: 1
@@ -12,7 +13,6 @@ jobs:
       vmImage: ubuntu-18.04
 
     variables:
-      PIP_CACHE_DIR: ".cache/pip"
       PRE_COMMIT_HOME: $(Pipeline.Workspace)/pre-commit-cache
       BOT_API_KEY: foo
       BOT_SENTRY_DSN: blah
@@ -29,11 +29,24 @@ jobs:
           versionSpec: '3.8.x'
           addToPath: true
 
+      - task: Cache@2
+        displayName: 'Restore Python environment'
+        inputs:
+          key: python | $(Agent.OS) | "$(PythonVersion.pythonLocation)" | ./Pipfile | ./Pipfile.lock
+          restoreKeys: |
+            python | "$(PythonVersion.pythonLocation)" | ./Pipfile.lock
+            python | "$(PythonVersion.pythonLocation)" | ./Pipfile
+            python | "$(PythonVersion.pythonLocation)"
+          cacheHitVar: PY_ENV_RESTORED
+          path: $(PythonVersion.pythonLocation)
+
       - script: pip install pipenv
         displayName: 'Install pipenv'
+        condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
 
       - script: pipenv install --dev --deploy --system
         displayName: 'Install project using pipenv'
+        condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
 
       # Create an executable shell script which replaces the original pipenv binary.
       # The shell script ignores the first argument and executes the rest of the args as a command.
-- 
cgit v1.2.3


From 952e46350bfd95521713f36fa0afcd4eb613026a Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 9 Mar 2020 17:33:17 -0700
Subject: CI: cache the Python user base dir

---
 azure-pipelines.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d7cf03aae..45c6699b5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,6 +5,8 @@ variables:
   PIPENV_HIDE_EMOJIS: 1
   PIPENV_IGNORE_VIRTUALENVS: 1
   PIPENV_NOSPIN: 1
+  PRE_COMMIT_HOME: $(Pipeline.Workspace)/pre-commit-cache
+  PYTHONUSERBASE: $(Pipeline.Workspace)/py-user-base
 
 jobs:
   - job: test
@@ -13,7 +15,6 @@ jobs:
       vmImage: ubuntu-18.04
 
     variables:
-      PRE_COMMIT_HOME: $(Pipeline.Workspace)/pre-commit-cache
       BOT_API_KEY: foo
       BOT_SENTRY_DSN: blah
       BOT_TOKEN: bar
@@ -38,13 +39,14 @@ jobs:
             python | "$(PythonVersion.pythonLocation)" | ./Pipfile
             python | "$(PythonVersion.pythonLocation)"
           cacheHitVar: PY_ENV_RESTORED
-          path: $(PythonVersion.pythonLocation)
+          path: $(PYTHONUSERBASE)
 
       - script: pip install pipenv
         displayName: 'Install pipenv'
         condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
 
-      - script: pipenv install --dev --deploy --system
+      # PIP_USER=1 will install packages to the user site.
+      - script: export PIP_USER=1; pipenv install --dev --deploy --system
         displayName: 'Install project using pipenv'
         condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
 
-- 
cgit v1.2.3


From e9d58e4e021d840a569c382a5494faa52e2ef260 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 9 Mar 2020 17:36:55 -0700
Subject: CI: prepend py user base to PATH

---
 azure-pipelines.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 45c6699b5..079530cc8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -50,6 +50,9 @@ jobs:
         displayName: 'Install project using pipenv'
         condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
 
+      - script: echo '##vso[task.prependpath]$(PYTHONUSERBASE)/bin'
+        displayName: 'Prepend PATH'
+
       # Create an executable shell script which replaces the original pipenv binary.
       # The shell script ignores the first argument and executes the rest of the args as a command.
       # It makes the `pipenv run flake8` command in the pre-commit hook work by circumventing
-- 
cgit v1.2.3


From 413f09fc4f200cab75ca64ec69cf82a125246dc0 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 9 Mar 2020 17:58:54 -0700
Subject: CI: invalidate caches

---
 azure-pipelines.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 079530cc8..3b0a23064 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -33,11 +33,11 @@ jobs:
       - task: Cache@2
         displayName: 'Restore Python environment'
         inputs:
-          key: python | $(Agent.OS) | "$(PythonVersion.pythonLocation)" | ./Pipfile | ./Pipfile.lock
+          key: python | $(Agent.OS) | "$(PythonVersion.pythonLocation)" | 0 | ./Pipfile | ./Pipfile.lock
           restoreKeys: |
-            python | "$(PythonVersion.pythonLocation)" | ./Pipfile.lock
-            python | "$(PythonVersion.pythonLocation)" | ./Pipfile
-            python | "$(PythonVersion.pythonLocation)"
+            python | "$(PythonVersion.pythonLocation)" | 0 | ./Pipfile.lock
+            python | "$(PythonVersion.pythonLocation)" | 0 | ./Pipfile
+            python | "$(PythonVersion.pythonLocation)" | 0
           cacheHitVar: PY_ENV_RESTORED
           path: $(PYTHONUSERBASE)
 
@@ -66,9 +66,9 @@ jobs:
       - task: Cache@2
         displayName: 'Restore pre-commit environment'
         inputs:
-          key: pre-commit | "$(PythonVersion.pythonLocation)" | .pre-commit-config.yaml
+          key: pre-commit | "$(PythonVersion.pythonLocation)" | 0 | .pre-commit-config.yaml
           restoreKeys: |
-            pre-commit | "$(PythonVersion.pythonLocation)"
+            pre-commit | "$(PythonVersion.pythonLocation)" | 0
           path: $(PRE_COMMIT_HOME)
 
       - script: pre-commit run --all-files
-- 
cgit v1.2.3


From fe3236c2e450e17f98454bf38b3b1f77298c78be Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 9 Mar 2020 18:53:53 -0700
Subject: CI: install pipenv to user site

Some of pipenv's dependencies overlap with dependencies in the Pipfile.
When installing from the Pipfile, any dependencies already present in
the global site will not be installed again to the user site, and thus
will not be cached. Therefore, pipenv is installed to the user site to
ensure all dependencies get cached.

* Move PATH prepend step before pipenv invocation
---
 azure-pipelines.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3b0a23064..9660b2621 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,6 +2,7 @@
 
 variables:
   PIP_NO_CACHE_DIR: false
+  PIP_USER: 1
   PIPENV_HIDE_EMOJIS: 1
   PIPENV_IGNORE_VIRTUALENVS: 1
   PIPENV_NOSPIN: 1
@@ -41,18 +42,17 @@ jobs:
           cacheHitVar: PY_ENV_RESTORED
           path: $(PYTHONUSERBASE)
 
+      - script: echo '##vso[task.prependpath]$(PYTHONUSERBASE)/bin'
+        displayName: 'Prepend PATH'
+
       - script: pip install pipenv
         displayName: 'Install pipenv'
         condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
 
-      # PIP_USER=1 will install packages to the user site.
-      - script: export PIP_USER=1; pipenv install --dev --deploy --system
+      - script: pipenv install --dev --deploy --system
         displayName: 'Install project using pipenv'
         condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
 
-      - script: echo '##vso[task.prependpath]$(PYTHONUSERBASE)/bin'
-        displayName: 'Prepend PATH'
-
       # Create an executable shell script which replaces the original pipenv binary.
       # The shell script ignores the first argument and executes the rest of the args as a command.
       # It makes the `pipenv run flake8` command in the pre-commit hook work by circumventing
-- 
cgit v1.2.3


From f6ed0362300227c35477f4a01263b496464f9d2d Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 9 Mar 2020 23:04:30 -0700
Subject: CI: don't do a user install for pre-commit venv

Prevents the following error:

Can not perform a '--user' install. User site-packages are not visible
in this virtualenv.
---
 azure-pipelines.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9660b2621..3557410c6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -71,7 +71,8 @@ jobs:
             pre-commit | "$(PythonVersion.pythonLocation)" | 0
           path: $(PRE_COMMIT_HOME)
 
-      - script: pre-commit run --all-files
+      # pre-commit's venv doesn't allow user installs - not that they're really needed anyway.
+      - script: export PIP_USER=0; pre-commit run --all-files
         displayName: 'Run pre-commit hooks'
 
       - script: coverage run -m xmlrunner
-- 
cgit v1.2.3


From c392ff64ac4c64ef4baa9834e6e0046e415ce0d9 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 11 Mar 2020 10:57:38 -0700
Subject: CI: rename UsePythonVersion task

"python" is a shorter and clearer name.
---
 azure-pipelines.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3557410c6..16e4489c0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - task: UsePythonVersion@0
         displayName: 'Set Python version'
-        name: PythonVersion
+        name: python
         inputs:
           versionSpec: '3.8.x'
           addToPath: true
@@ -34,11 +34,11 @@ jobs:
       - task: Cache@2
         displayName: 'Restore Python environment'
         inputs:
-          key: python | $(Agent.OS) | "$(PythonVersion.pythonLocation)" | 0 | ./Pipfile | ./Pipfile.lock
+          key: python | $(Agent.OS) | "$(python.pythonLocation)" | 0 | ./Pipfile | ./Pipfile.lock
           restoreKeys: |
-            python | "$(PythonVersion.pythonLocation)" | 0 | ./Pipfile.lock
-            python | "$(PythonVersion.pythonLocation)" | 0 | ./Pipfile
-            python | "$(PythonVersion.pythonLocation)" | 0
+            python | "$(python.pythonLocation)" | 0 | ./Pipfile.lock
+            python | "$(python.pythonLocation)" | 0 | ./Pipfile
+            python | "$(python.pythonLocation)" | 0
           cacheHitVar: PY_ENV_RESTORED
           path: $(PYTHONUSERBASE)
 
@@ -59,16 +59,16 @@ jobs:
       # pipenv entirely, which is too dumb to know it should use the system interpreter rather than
       # creating a new venv.
       - script: |
-          printf '%s\n%s' '#!/bin/bash' '"${@:2}"' > $(PythonVersion.pythonLocation)/bin/pipenv \
-          && chmod +x $(PythonVersion.pythonLocation)/bin/pipenv
+          printf '%s\n%s' '#!/bin/bash' '"${@:2}"' > $(python.pythonLocation)/bin/pipenv \
+          && chmod +x $(python.pythonLocation)/bin/pipenv
         displayName: 'Mock pipenv binary'
 
       - task: Cache@2
         displayName: 'Restore pre-commit environment'
         inputs:
-          key: pre-commit | "$(PythonVersion.pythonLocation)" | 0 | .pre-commit-config.yaml
+          key: pre-commit | "$(python.pythonLocation)" | 0 | .pre-commit-config.yaml
           restoreKeys: |
-            pre-commit | "$(PythonVersion.pythonLocation)" | 0
+            pre-commit | "$(python.pythonLocation)" | 0
           path: $(PRE_COMMIT_HOME)
 
       # pre-commit's venv doesn't allow user installs - not that they're really needed anyway.
-- 
cgit v1.2.3


From 95db4c912787921cf8324e9f65ad4ee1bbb898bd Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Wed, 25 Mar 2020 10:11:28 -0700
Subject: CI: remove support for partial cache hits

Partial hits may cause issues when packages get removed. The cache will
get bloated with packages which are no longer needed. They will keep
accumulating as more packages get removed unless the cache is unused for
7 days and gets automatically deleted by Azure Pipelines. Lingering
packages are also a potential cause for conflicts (e.g. unused package x
depends on package y==4.0 and useful package z depends on y==5.0).

Removing support for partial hits means all dependencies will be
installed whenever a single dependency changes.
---
 azure-pipelines.yml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 16e4489c0..d56675029 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,10 +35,6 @@ jobs:
         displayName: 'Restore Python environment'
         inputs:
           key: python | $(Agent.OS) | "$(python.pythonLocation)" | 0 | ./Pipfile | ./Pipfile.lock
-          restoreKeys: |
-            python | "$(python.pythonLocation)" | 0 | ./Pipfile.lock
-            python | "$(python.pythonLocation)" | 0 | ./Pipfile
-            python | "$(python.pythonLocation)" | 0
           cacheHitVar: PY_ENV_RESTORED
           path: $(PYTHONUSERBASE)
 
@@ -67,8 +63,6 @@ jobs:
         displayName: 'Restore pre-commit environment'
         inputs:
           key: pre-commit | "$(python.pythonLocation)" | 0 | .pre-commit-config.yaml
-          restoreKeys: |
-            pre-commit | "$(python.pythonLocation)" | 0
           path: $(PRE_COMMIT_HOME)
 
       # pre-commit's venv doesn't allow user installs - not that they're really needed anyway.
-- 
cgit v1.2.3


From 489f9405a77eb88baa0d77a88fd04bf13cbbde1f Mon Sep 17 00:00:00 2001
From: Leon Sandøy <leon.sandoy@conmodo.com>
Date: Sat, 23 May 2020 14:21:39 +0200
Subject: CI needs REDIS_PASSWORD to pass tests

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d56675029..4500cb6e8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,6 +22,7 @@ jobs:
       REDDIT_CLIENT_ID: spam
       REDDIT_SECRET: ham
       WOLFRAM_API_KEY: baz
+      REDIS_PASSWORD: ''
 
     steps:
       - task: UsePythonVersion@0
-- 
cgit v1.2.3


From 9243dcb47d126cb506baf2e57d18ba2be7a7c2e6 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Tue, 6 Oct 2020 14:14:11 -0700
Subject: CI: avoid failing whole job if a cache task fails

Restoring from cache is non-critical. The CI can recover if cache tasks
fail.
---
 azure-pipelines.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4500cb6e8..9f58e38c8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,7 +21,6 @@ jobs:
       BOT_TOKEN: bar
       REDDIT_CLIENT_ID: spam
       REDDIT_SECRET: ham
-      WOLFRAM_API_KEY: baz
       REDIS_PASSWORD: ''
 
     steps:
@@ -38,6 +37,7 @@ jobs:
           key: python | $(Agent.OS) | "$(python.pythonLocation)" | 0 | ./Pipfile | ./Pipfile.lock
           cacheHitVar: PY_ENV_RESTORED
           path: $(PYTHONUSERBASE)
+        continueOnError: true
 
       - script: echo '##vso[task.prependpath]$(PYTHONUSERBASE)/bin'
         displayName: 'Prepend PATH'
@@ -65,6 +65,7 @@ jobs:
         inputs:
           key: pre-commit | "$(python.pythonLocation)" | 0 | .pre-commit-config.yaml
           path: $(PRE_COMMIT_HOME)
+        continueOnError: true
 
       # pre-commit's venv doesn't allow user installs - not that they're really needed anyway.
       - script: export PIP_USER=0; pre-commit run --all-files
-- 
cgit v1.2.3


From 36bffe9653b33c64aea21c5c31471f69d290ed37 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Wed, 11 Nov 2020 21:34:39 +0100
Subject: CI: invalidate dependency cache

The cache became corrupted for reasons what we were not able to figure
out, causing the pre-commit step to fail when the environment was
retrieved from the cache. By changing the key, we force cache rebuild.
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9f58e38c8..991b1f447 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,7 +34,7 @@ jobs:
       - task: Cache@2
         displayName: 'Restore Python environment'
         inputs:
-          key: python | $(Agent.OS) | "$(python.pythonLocation)" | 0 | ./Pipfile | ./Pipfile.lock
+          key: python | $(Agent.OS) | "$(python.pythonLocation)" | 1 | ./Pipfile | ./Pipfile.lock
           cacheHitVar: PY_ENV_RESTORED
           path: $(PYTHONUSERBASE)
         continueOnError: true
-- 
cgit v1.2.3


From 9794016943861fb41d1b84a24d2766fad0771a16 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 13 Nov 2020 08:26:59 +0100
Subject: CI: invalidate environment cache

The cache was corrupted again for unknown reasons.
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 991b1f447..0aa36a940 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,7 +34,7 @@ jobs:
       - task: Cache@2
         displayName: 'Restore Python environment'
         inputs:
-          key: python | $(Agent.OS) | "$(python.pythonLocation)" | 1 | ./Pipfile | ./Pipfile.lock
+          key: python | $(Agent.OS) | "$(python.pythonLocation)" | 2 | ./Pipfile | ./Pipfile.lock
           cacheHitVar: PY_ENV_RESTORED
           path: $(PYTHONUSERBASE)
         continueOnError: true
-- 
cgit v1.2.3


From 8885b15ca367398cd3208cbe3e9fce2e85b6a379 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Fri, 13 Nov 2020 08:30:27 +0100
Subject: CI: disable 'continueOnError'

After #1219, we started to encounter issues with the cache being
corrupted and CI failing due to 'pre-commit' not being installed
after restore.

Although it doesn't seem likely that this could have been the culprit,
the issues began appearing shortly after merging the PR.

Let's see what happens if we disable it.
---
 azure-pipelines.yml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'azure-pipelines.yml')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0aa36a940..188ad7f93 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -37,7 +37,6 @@ jobs:
           key: python | $(Agent.OS) | "$(python.pythonLocation)" | 2 | ./Pipfile | ./Pipfile.lock
           cacheHitVar: PY_ENV_RESTORED
           path: $(PYTHONUSERBASE)
-        continueOnError: true
 
       - script: echo '##vso[task.prependpath]$(PYTHONUSERBASE)/bin'
         displayName: 'Prepend PATH'
@@ -65,7 +64,6 @@ jobs:
         inputs:
           key: pre-commit | "$(python.pythonLocation)" | 0 | .pre-commit-config.yaml
           path: $(PRE_COMMIT_HOME)
-        continueOnError: true
 
       # pre-commit's venv doesn't allow user installs - not that they're really needed anyway.
       - script: export PIP_USER=0; pre-commit run --all-files
-- 
cgit v1.2.3


From 4d4dfe42632cc88265efcb8052b7bca5209d3f4d Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <sebastiaan.zeeff@gmail.com>
Date: Fri, 13 Nov 2020 18:39:04 +0100
Subject: Migrate CI Pipeline to GitHub Actions

I've migrated our Azure CI Pipeline to GitHub Actions. While the general
workflow is the same, there are a few changes:

- `flake8` is no longer run by `pre-commit`, but rather by a separate
  action that adds annotations to the GH Action results page.

- As we no longer have need for xml-formatted coverage files, the
  xmlrunner for unittest has been removed as a dependency. Instead, we
  now publish our coverage results to coveralls.io.

- We use version 2 of docker's GitHub Action build-and-push flow, which
  is split over multiple steps instead of one.

- I have changed the badges to GitHub Actions and coveralls.io badges.

Note: Because we accept PRs from forks, we need to be a bit careful with
our secrets. While we do use the `pull_request_target` event, we should
not expose secrets in steps that run code from the repository.

Signed-off-by: Sebastiaan Zeeff <sebastiaan.zeeff@gmail.com>
---
 .github/workflows/lint-test-build.yml | 122 +++++++++++++++
 Pipfile                               |   1 -
 Pipfile.lock                          | 282 +++++++++++++++++-----------------
 README.md                             |   5 +-
 azure-pipelines.yml                   | 106 -------------
 5 files changed, 265 insertions(+), 251 deletions(-)
 create mode 100644 .github/workflows/lint-test-build.yml
 delete mode 100644 azure-pipelines.yml

(limited to 'azure-pipelines.yml')

diff --git a/.github/workflows/lint-test-build.yml b/.github/workflows/lint-test-build.yml
new file mode 100644
index 000000000..dc472ec8e
--- /dev/null
+++ b/.github/workflows/lint-test-build.yml
@@ -0,0 +1,122 @@
+name: Lint, Test, Build
+
+on:
+  push:
+    branches:
+      - master
+  # We use pull_request_target as we get PRs from
+  # forks, but need to be able to add annotations
+  # for our flake8 step.
+  pull_request_target:
+
+
+jobs:
+  lint-test:
+    runs-on: ubuntu-latest
+    env:
+      BOT_API_KEY: foo
+      BOT_SENTRY_DSN: blah
+      BOT_TOKEN: bar
+      REDDIT_CLIENT_ID: spam
+      REDDIT_SECRET: ham
+      REDIS_PASSWORD: ''
+
+      PIP_NO_CACHE_DIR: false
+      PIP_USER: 1
+      PIPENV_HIDE_EMOJIS: 1
+      PIPENV_IGNORE_VIRTUALENVS: 1
+      PIPENV_NOSPIN: 1
+      PRE_COMMIT_HOME: ${{ github.workspace }}/.cache/pre-commit-cache
+      PYTHONUSERBASE: ${{ github.workspace }}/.cache/py-user-base
+
+    steps:
+      - name: Add custom PYTHONUSERBASE to PATH
+        run: echo '${{ env.PYTHONUSERBASE }}/bin/' >> $GITHUB_PATH
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup python
+        id: python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+
+      - name: Python Dependency Caching
+        uses: actions/cache@v2
+        id: python_cache
+        with:
+          path: ${{ env.PYTHONUSERBASE }}
+          key: "python-0-${{ runner.os }}-${{ env.PYTHONUSERBASE }}-\
+          ${{ steps.python.outputs.python-version }}-\
+          ${{ hashFiles('./Pipfile', './Pipfile.lock') }}"
+
+      - name: Install dependencies using pipenv
+        if: steps.python_cache.outputs.cache-hit != 'true'
+        run: |
+          pip install pipenv
+          pipenv install --dev --deploy --system
+
+      - name: Pre-commit Environment Caching
+        uses: actions/cache@v2
+        id: pre_commit_cache
+        with:
+          path: ${{ env.PRE_COMMIT_HOME }}
+          key: "precommit-0-${{ runner.os }}-${{ env.PRE_COMMIT_HOME }}-\
+          ${{ steps.python.outputs.python-version }}-\
+          ${{ hashFiles('./.pre-commit-config.yaml') }}"
+
+      # We will not run `flake8` here, as we will use a separate flake8 action
+      - name: Run pre-commit hooks
+        run: export PIP_USER=0; SKIP=flake8 pre-commit run --all-files
+
+      # This step requires `pull_request_target` due to the use of annotations
+      - name: Run flake8
+        uses: julianwachholz/flake8-action@v1
+        with:
+          checkName: lint
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # We run `coverage` using the `python` command so we can suppress
+      # irrelevant warnings in our CI output.
+      - name: Run tests and generate coverage report
+        run: |
+            python -Wignore -m coverage run -m unittest
+            coverage report -m
+
+      # This step will publish the coverage reports coveralls.io and
+      # print a "job" link in the output of the GitHub Action
+      - name: Publish coverage report to coveralls.io
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          pip install coveralls
+          coveralls
+
+  build-and-push:
+    needs: lint-test
+    if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          cache-from: type=registry,ref=pythondiscord/bot:latest
+          tags: pythondiscord/bot:latest
diff --git a/Pipfile b/Pipfile
index 99fc70b46..b8a542653 100644
--- a/Pipfile
+++ b/Pipfile
@@ -39,7 +39,6 @@ flake8-tidy-imports = "~=4.0"
 flake8-todo = "~=0.7"
 pep8-naming = "~=0.9"
 pre-commit = "~=2.1"
-unittest-xml-reporting = "~=3.0"
 
 [requires]
 python_version = "3.8"
diff --git a/Pipfile.lock b/Pipfile.lock
index becd85c55..ebd7f20fd 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "073fd0c51749aafa188fdbe96c5b90dd157cb1d23bdd144801fb0d0a369ffa88"
+            "sha256": "906565a018f17354f8f5f1508505fdac1f52b522caab8d539654136eb3194f50"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -34,21 +34,22 @@
         },
         "aiohttp": {
             "hashes": [
-                "sha256:1e984191d1ec186881ffaed4581092ba04f7c61582a177b187d3a2f07ed9719e",
-                "sha256:259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326",
-                "sha256:2f4d1a4fdce595c947162333353d4a44952a724fba9ca3205a3df99a33d1307a",
-                "sha256:32e5f3b7e511aa850829fbe5aa32eb455e5534eaa4b1ce93231d00e2f76e5654",
-                "sha256:344c780466b73095a72c616fac5ea9c4665add7fc129f285fbdbca3cccf4612a",
-                "sha256:460bd4237d2dbecc3b5ed57e122992f60188afe46e7319116da5eb8a9dfedba4",
-                "sha256:4c6efd824d44ae697814a2a85604d8e992b875462c6655da161ff18fd4f29f17",
-                "sha256:50aaad128e6ac62e7bf7bd1f0c0a24bc968a0c0590a726d5a955af193544bcec",
-                "sha256:6206a135d072f88da3e71cc501c59d5abffa9d0bb43269a6dcd28d66bfafdbdd",
-                "sha256:65f31b622af739a802ca6fd1a3076fd0ae523f8485c52924a89561ba10c49b48",
-                "sha256:ae55bac364c405caa23a4f2d6cfecc6a0daada500274ffca4a9230e7129eac59",
-                "sha256:b778ce0c909a2653741cb4b1ac7015b5c130ab9c897611df43ae6a58523cb965"
+                "sha256:1a4160579ffbc1b69e88cb6ca8bb0fbd4947dfcbf9fb1e2a4fc4c7a4a986c1fe",
+                "sha256:206c0ccfcea46e1bddc91162449c20c72f308aebdcef4977420ef329c8fcc599",
+                "sha256:2ad493de47a8f926386fa6d256832de3095ba285f325db917c7deae0b54a9fc8",
+                "sha256:319b490a5e2beaf06891f6711856ea10591cfe84fe9f3e71a721aa8f20a0872a",
+                "sha256:470e4c90da36b601676fe50c49a60d34eb8c6593780930b1aa4eea6f508dfa37",
+                "sha256:60f4caa3b7f7a477f66ccdd158e06901e1d235d572283906276e3803f6b098f5",
+                "sha256:66d64486172b032db19ea8522328b19cfb78a3e1e5b62ab6a0567f93f073dea0",
+                "sha256:687461cd974722110d1763b45c5db4d2cdee8d50f57b00c43c7590d1dd77fc5c",
+                "sha256:698cd7bc3c7d1b82bb728bae835724a486a8c376647aec336aa21a60113c3645",
+                "sha256:797456399ffeef73172945708810f3277f794965eb6ec9bd3a0c007c0476be98",
+                "sha256:a885432d3cabc1287bcf88ea94e1826d3aec57fd5da4a586afae4591b061d40d",
+                "sha256:c506853ba52e516b264b106321c424d03f3ddef2813246432fa9d1cefd361c81",
+                "sha256:fb83326d8295e8840e4ba774edf346e87eca78ba8a89c55d2690352842c15ba5"
             ],
             "index": "pypi",
-            "version": "==3.6.2"
+            "version": "==3.6.3"
         },
         "aioping": {
             "hashes": [
@@ -68,11 +69,11 @@
         },
         "aiormq": {
             "hashes": [
-                "sha256:106695a836f19c1af6c46b58e8aac80e00f86c5b3287a3c6483a1ee369cc95c9",
-                "sha256:9f6dbf6155fe2b7a3d24bf68de97fb812db0fac0a54e96bc1af14ea95078ba7f"
+                "sha256:8218dd9f7198d6e7935855468326bbacf0089f926c70baa8dd92944cb2496573",
+                "sha256:e584dac13a242589aaf42470fd3006cb0dc5aed6506cbd20357c7ec8bbe4a89e"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.2.3"
+            "version": "==3.3.1"
         },
         "alabaster": {
             "hashes": [
@@ -103,35 +104,35 @@
         },
         "attrs": {
             "hashes": [
-                "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594",
-                "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.2.0"
+            "version": "==20.3.0"
         },
         "babel": {
             "hashes": [
-                "sha256:1aac2ae2d0d8ea368fa90906567f5c08463d98ade155c0c4bfedd6a0f7160e38",
-                "sha256:d670ea0b10f8b723672d3a6abeb87b565b244da220d76b4dba1b66269ec152d4"
+                "sha256:9d35c22fcc79893c3ecc85ac4a56cde1ecf3f19c540bba0922308a6c06ca6fa5",
+                "sha256:da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==2.8.0"
+            "version": "==2.9.0"
         },
         "beautifulsoup4": {
             "hashes": [
-                "sha256:1edf5e39f3a5bc6e38b235b369128416c7239b34f692acccececb040233032a1",
-                "sha256:5dfe44f8fddc89ac5453f02659d3ab1668f2c0d9684839f0785037e8c6d9ac8d",
-                "sha256:645d833a828722357038299b7f6879940c11dddd95b900fe5387c258b72bb883"
+                "sha256:4c98143716ef1cb40bf7f39a8e3eec8f8b009509e74904ba3a7b315431577e35",
+                "sha256:84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25",
+                "sha256:fff47e031e34ec82bf17e00da8f592fe7de69aeea38be00523c04623c04fb666"
             ],
             "index": "pypi",
-            "version": "==4.9.2"
+            "version": "==4.9.3"
         },
         "certifi": {
             "hashes": [
-                "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3",
-                "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41"
+                "sha256:1f422849db327d534e3d0c5f02a263458c3955ec0aae4ff09b95f195c59f4edd",
+                "sha256:f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4"
             ],
-            "version": "==2020.6.20"
+            "version": "==2020.11.8"
         },
         "cffi": {
             "hashes": [
@@ -183,11 +184,11 @@
         },
         "colorama": {
             "hashes": [
-                "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff",
-                "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"
+                "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b",
+                "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"
             ],
             "markers": "sys_platform == 'win32'",
-            "version": "==0.4.3"
+            "version": "==0.4.4"
         },
         "coloredlogs": {
             "hashes": [
@@ -207,11 +208,11 @@
         },
         "discord.py": {
             "hashes": [
-                "sha256:3acb61fde0d862ed346a191d69c46021e6063673f63963bc984ae09a685ab211",
-                "sha256:e71089886aa157341644bdecad63a72ff56b44406b1a6467b66db31c8e5a5a15"
+                "sha256:2367359e31f6527f8a936751fc20b09d7495dd6a76b28c8fb13d4ca6c55b7563",
+                "sha256:def00dc50cf36d21346d71bc89f0cad8f18f9a3522978dc18c7796287d47de8b"
             ],
             "index": "pypi",
-            "version": "==1.5.0"
+            "version": "==1.5.1"
         },
         "docutils": {
             "hashes": [
@@ -223,10 +224,10 @@
         },
         "fakeredis": {
             "hashes": [
-                "sha256:7ea0866ba5edb40fe2e9b1722535df0c7e6b91d518aa5f50d96c2fff3ea7f4c2",
-                "sha256:aad8836ffe0319ffbba66dcf872ac6e7e32d1f19790e31296ba58445efb0a5c7"
+                "sha256:8070b7fce16f828beaef2c757a4354af91698685d5232404f1aeeb233529c7a5",
+                "sha256:f8c8ea764d7b6fd801e7f5486e3edd32ca991d506186f1923a01fc072e33c271"
             ],
-            "version": "==1.4.3"
+            "version": "==1.4.4"
         },
         "feedparser": {
             "hashes": [
@@ -331,40 +332,46 @@
         },
         "lxml": {
             "hashes": [
-                "sha256:05a444b207901a68a6526948c7cc8f9fe6d6f24c70781488e32fd74ff5996e3f",
-                "sha256:08fc93257dcfe9542c0a6883a25ba4971d78297f63d7a5a26ffa34861ca78730",
-                "sha256:107781b213cf7201ec3806555657ccda67b1fccc4261fb889ef7fc56976db81f",
-                "sha256:121b665b04083a1e85ff1f5243d4a93aa1aaba281bc12ea334d5a187278ceaf1",
-                "sha256:1fa21263c3aba2b76fd7c45713d4428dbcc7644d73dcf0650e9d344e433741b3",
-                "sha256:2b30aa2bcff8e958cd85d907d5109820b01ac511eae5b460803430a7404e34d7",
-                "sha256:4b4a111bcf4b9c948e020fd207f915c24a6de3f1adc7682a2d92660eb4e84f1a",
-                "sha256:5591c4164755778e29e69b86e425880f852464a21c7bb53c7ea453bbe2633bbe",
-                "sha256:59daa84aef650b11bccd18f99f64bfe44b9f14a08a28259959d33676554065a1",
-                "sha256:5a9c8d11aa2c8f8b6043d845927a51eb9102eb558e3f936df494e96393f5fd3e",
-                "sha256:5dd20538a60c4cc9a077d3b715bb42307239fcd25ef1ca7286775f95e9e9a46d",
-                "sha256:74f48ec98430e06c1fa8949b49ebdd8d27ceb9df8d3d1c92e1fdc2773f003f20",
-                "sha256:786aad2aa20de3dbff21aab86b2fb6a7be68064cbbc0219bde414d3a30aa47ae",
-                "sha256:7ad7906e098ccd30d8f7068030a0b16668ab8aa5cda6fcd5146d8d20cbaa71b5",
-                "sha256:80a38b188d20c0524fe8959c8ce770a8fdf0e617c6912d23fc97c68301bb9aba",
-                "sha256:8f0ec6b9b3832e0bd1d57af41f9238ea7709bbd7271f639024f2fc9d3bb01293",
-                "sha256:92282c83547a9add85ad658143c76a64a8d339028926d7dc1998ca029c88ea6a",
-                "sha256:94150231f1e90c9595ccc80d7d2006c61f90a5995db82bccbca7944fd457f0f6",
-                "sha256:9dc9006dcc47e00a8a6a029eb035c8f696ad38e40a27d073a003d7d1443f5d88",
-                "sha256:a76979f728dd845655026ab991df25d26379a1a8fc1e9e68e25c7eda43004bed",
-                "sha256:aa8eba3db3d8761db161003e2d0586608092e217151d7458206e243be5a43843",
-                "sha256:bea760a63ce9bba566c23f726d72b3c0250e2fa2569909e2d83cda1534c79443",
-                "sha256:c3f511a3c58676147c277eff0224c061dd5a6a8e1373572ac817ac6324f1b1e0",
-                "sha256:c9d317efde4bafbc1561509bfa8a23c5cab66c44d49ab5b63ff690f5159b2304",
-                "sha256:cc411ad324a4486b142c41d9b2b6a722c534096963688d879ea6fa8a35028258",
-                "sha256:cdc13a1682b2a6241080745b1953719e7fe0850b40a5c71ca574f090a1391df6",
-                "sha256:cfd7c5dd3c35c19cec59c63df9571c67c6d6e5c92e0fe63517920e97f61106d1",
-                "sha256:e1cacf4796b20865789083252186ce9dc6cc59eca0c2e79cca332bdff24ac481",
-                "sha256:e70d4e467e243455492f5de463b72151cc400710ac03a0678206a5f27e79ddef",
-                "sha256:ecc930ae559ea8a43377e8b60ca6f8d61ac532fc57efb915d899de4a67928efd",
-                "sha256:f161af26f596131b63b236372e4ce40f3167c1b5b5d459b29d2514bd8c9dc9ee"
-            ],
-            "index": "pypi",
-            "version": "==4.5.2"
+                "sha256:098fb713b31050463751dcc694878e1d39f316b86366fb9fe3fbbe5396ac9fab",
+                "sha256:0e89f5d422988c65e6936e4ec0fe54d6f73f3128c80eb7ecc3b87f595523607b",
+                "sha256:189ad47203e846a7a4951c17694d845b6ade7917c47c64b29b86526eefc3adf5",
+                "sha256:1d87936cb5801c557f3e981c9c193861264c01209cb3ad0964a16310ca1b3301",
+                "sha256:211b3bcf5da70c2d4b84d09232534ad1d78320762e2c59dedc73bf01cb1fc45b",
+                "sha256:2358809cc64394617f2719147a58ae26dac9e21bae772b45cfb80baa26bfca5d",
+                "sha256:23c83112b4dada0b75789d73f949dbb4e8f29a0a3511647024a398ebd023347b",
+                "sha256:24e811118aab6abe3ce23ff0d7d38932329c513f9cef849d3ee88b0f848f2aa9",
+                "sha256:2d5896ddf5389560257bbe89317ca7bcb4e54a02b53a3e572e1ce4226512b51b",
+                "sha256:2d6571c48328be4304aee031d2d5046cbc8aed5740c654575613c5a4f5a11311",
+                "sha256:2e311a10f3e85250910a615fe194839a04a0f6bc4e8e5bb5cac221344e3a7891",
+                "sha256:302160eb6e9764168e01d8c9ec6becddeb87776e81d3fcb0d97954dd51d48e0a",
+                "sha256:3a7a380bfecc551cfd67d6e8ad9faa91289173bdf12e9cfafbd2bdec0d7b1ec1",
+                "sha256:3d9b2b72eb0dbbdb0e276403873ecfae870599c83ba22cadff2db58541e72856",
+                "sha256:475325e037fdf068e0c2140b818518cf6bc4aa72435c407a798b2db9f8e90810",
+                "sha256:4b7572145054330c8e324a72d808c8c8fbe12be33368db28c39a255ad5f7fb51",
+                "sha256:4fff34721b628cce9eb4538cf9a73d02e0f3da4f35a515773cce6f5fe413b360",
+                "sha256:56eff8c6fb7bc4bcca395fdff494c52712b7a57486e4fbde34c31bb9da4c6cc4",
+                "sha256:573b2f5496c7e9f4985de70b9bbb4719ffd293d5565513e04ac20e42e6e5583f",
+                "sha256:7ecaef52fd9b9535ae5f01a1dd2651f6608e4ec9dc136fc4dfe7ebe3c3ddb230",
+                "sha256:803a80d72d1f693aa448566be46ffd70882d1ad8fc689a2e22afe63035eb998a",
+                "sha256:8862d1c2c020cb7a03b421a9a7b4fe046a208db30994fc8ff68c627a7915987f",
+                "sha256:9b06690224258db5cd39a84e993882a6874676f5de582da57f3df3a82ead9174",
+                "sha256:a71400b90b3599eb7bf241f947932e18a066907bf84617d80817998cee81e4bf",
+                "sha256:bb252f802f91f59767dcc559744e91efa9df532240a502befd874b54571417bd",
+                "sha256:be1ebf9cc25ab5399501c9046a7dcdaa9e911802ed0e12b7d620cd4bbf0518b3",
+                "sha256:be7c65e34d1b50ab7093b90427cbc488260e4b3a38ef2435d65b62e9fa3d798a",
+                "sha256:c0dac835c1a22621ffa5e5f999d57359c790c52bbd1c687fe514ae6924f65ef5",
+                "sha256:c152b2e93b639d1f36ec5a8ca24cde4a8eefb2b6b83668fcd8e83a67badcb367",
+                "sha256:d182eada8ea0de61a45a526aa0ae4bcd222f9673424e65315c35820291ff299c",
+                "sha256:d18331ea905a41ae71596502bd4c9a2998902328bbabd29e3d0f5f8569fabad1",
+                "sha256:d20d32cbb31d731def4b1502294ca2ee99f9249b63bc80e03e67e8f8e126dea8",
+                "sha256:d4ad7fd3269281cb471ad6c7bafca372e69789540d16e3755dd717e9e5c9d82f",
+                "sha256:d6f8c23f65a4bfe4300b85f1f40f6c32569822d08901db3b6454ab785d9117cc",
+                "sha256:d84d741c6e35c9f3e7406cb7c4c2e08474c2a6441d59322a00dcae65aac6315d",
+                "sha256:e65c221b2115a91035b55a593b6eb94aa1206fa3ab374f47c6dc10d364583ff9",
+                "sha256:f98b6f256be6cec8dd308a8563976ddaff0bdc18b730720f6f4bee927ffe926f"
+            ],
+            "index": "pypi",
+            "version": "==4.6.1"
         },
         "markdownify": {
             "hashes": [
@@ -415,11 +422,11 @@
         },
         "more-itertools": {
             "hashes": [
-                "sha256:6f83822ae94818eae2612063a5101a7311e68ae8002005b5e05f03fd74a86a20",
-                "sha256:9b30f12df9393f0d28af9210ff8efe48d10c94f73e5daf886f10c4b0b0b4f03c"
+                "sha256:8e1a2a43b2f2727425f2b5839587ae37093f19153dc26c0927d1048ff6557330",
+                "sha256:b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf"
             ],
             "index": "pypi",
-            "version": "==8.5.0"
+            "version": "==8.6.0"
         },
         "multidict": {
             "hashes": [
@@ -510,11 +517,11 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:307543fe65c0947b126e83dd5a61bd8acbd84abec11f43caebaf5534cbc17998",
-                "sha256:926c3f319eda178d1bd90851e4317e6d8cdb5e292a3386aac9bd75eca29cf9c7"
+                "sha256:381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0",
+                "sha256:88a0bbcd659fcb9573703957c6b9cff9fab7295e6e76db54c9d00ae42df32773"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==2.7.1"
+            "version": "==2.7.2"
         },
         "pyparsing": {
             "hashes": [
@@ -534,10 +541,10 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed",
-                "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048"
+                "sha256:3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268",
+                "sha256:5c55e189b682d420be27c6995ba6edce0c0a77dd67bfbe2ae6607134d5851ffd"
             ],
-            "version": "==2020.1"
+            "version": "==2020.4"
         },
         "pyyaml": {
             "hashes": [
@@ -566,19 +573,19 @@
         },
         "requests": {
             "hashes": [
-                "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b",
-                "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"
+                "sha256:7f1a0b932f4a60a1a65caa4263921bb7d9ee911957e0ae4a23a6dd08185ad5f8",
+                "sha256:e786fa28d8c9154e6a4de5d46a1d921b8749f8b74e28bde23768e5e16eece998"
             ],
             "index": "pypi",
-            "version": "==2.24.0"
+            "version": "==2.25.0"
         },
         "sentry-sdk": {
             "hashes": [
-                "sha256:c9c0fa1412bad87104c4eee8dd36c7bbf60b0d92ae917ab519094779b22e6d9a",
-                "sha256:e159f7c919d19ae86e5a4ff370fccc45149fab461fbeb93fb5a735a0b33a9cb1"
+                "sha256:81d7a5d8ca0b13a16666e8280127b004565aa988bfeec6481e98a8601804b215",
+                "sha256:fd48f627945511c140546939b4d73815be4860cd1d2b9149577d7f6563e7bd60"
             ],
             "index": "pypi",
-            "version": "==0.17.8"
+            "version": "==0.19.3"
         },
         "six": {
             "hashes": [
@@ -597,10 +604,10 @@
         },
         "sortedcontainers": {
             "hashes": [
-                "sha256:4e73a757831fc3ca4de2859c422564239a31d8213d09a2a666e375807034d2ba",
-                "sha256:c633ebde8580f241f274c1f8994a665c0e54a17724fecd0cae2f079e09c36d3f"
+                "sha256:37257a32add0a3ee490bb170b599e93095eed89a55da91fa9f48753ea12fd73f",
+                "sha256:59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1"
             ],
-            "version": "==2.2.2"
+            "version": "==2.3.0"
         },
         "soupsieve": {
             "hashes": [
@@ -676,34 +683,34 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a",
-                "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461"
+                "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",
+                "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==1.25.10"
+            "version": "==1.26.2"
         },
         "yarl": {
             "hashes": [
-                "sha256:04a54f126a0732af75e5edc9addeaa2113e2ca7c6fce8974a63549a70a25e50e",
-                "sha256:3cc860d72ed989f3b1f3abbd6ecf38e412de722fb38b8f1b1a086315cf0d69c5",
-                "sha256:5d84cc36981eb5a8533be79d6c43454c8e6a39ee3118ceaadbd3c029ab2ee580",
-                "sha256:5e447e7f3780f44f890360ea973418025e8c0cdcd7d6a1b221d952600fd945dc",
-                "sha256:61d3ea3c175fe45f1498af868879c6ffeb989d4143ac542163c45538ba5ec21b",
-                "sha256:67c5ea0970da882eaf9efcf65b66792557c526f8e55f752194eff8ec722c75c2",
-                "sha256:6f6898429ec3c4cfbef12907047136fd7b9e81a6ee9f105b45505e633427330a",
-                "sha256:7ce35944e8e61927a8f4eb78f5bc5d1e6da6d40eadd77e3f79d4e9399e263921",
-                "sha256:b7c199d2cbaf892ba0f91ed36d12ff41ecd0dde46cbf64ff4bfe997a3ebc925e",
-                "sha256:c15d71a640fb1f8e98a1423f9c64d7f1f6a3a168f803042eaf3a5b5022fde0c1",
-                "sha256:c22607421f49c0cb6ff3ed593a49b6a99c6ffdeaaa6c944cdda83c2393c8864d",
-                "sha256:c604998ab8115db802cc55cb1b91619b2831a6128a62ca7eea577fc8ea4d3131",
-                "sha256:d088ea9319e49273f25b1c96a3763bf19a882cff774d1792ae6fba34bd40550a",
-                "sha256:db9eb8307219d7e09b33bcb43287222ef35cbcf1586ba9472b0a4b833666ada1",
-                "sha256:e31fef4e7b68184545c3d68baec7074532e077bd1906b040ecfba659737df188",
-                "sha256:e32f0fb443afcfe7f01f95172b66f279938fbc6bdaebe294b0ff6747fb6db020",
-                "sha256:fcbe419805c9b20db9a51d33b942feddbf6e7fb468cb20686fd7089d4164c12a"
+                "sha256:040b237f58ff7d800e6e0fd89c8439b841f777dd99b4a9cca04d6935564b9409",
+                "sha256:17668ec6722b1b7a3a05cc0167659f6c95b436d25a36c2d52db0eca7d3f72593",
+                "sha256:3a584b28086bc93c888a6c2aa5c92ed1ae20932f078c46509a66dce9ea5533f2",
+                "sha256:4439be27e4eee76c7632c2427ca5e73703151b22cae23e64adb243a9c2f565d8",
+                "sha256:48e918b05850fffb070a496d2b5f97fc31d15d94ca33d3d08a4f86e26d4e7c5d",
+                "sha256:9102b59e8337f9874638fcfc9ac3734a0cfadb100e47d55c20d0dc6087fb4692",
+                "sha256:9b930776c0ae0c691776f4d2891ebc5362af86f152dd0da463a6614074cb1b02",
+                "sha256:b3b9ad80f8b68519cc3372a6ca85ae02cc5a8807723ac366b53c0f089db19e4a",
+                "sha256:bc2f976c0e918659f723401c4f834deb8a8e7798a71be4382e024bcc3f7e23a8",
+                "sha256:c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6",
+                "sha256:c52ce2883dc193824989a9b97a76ca86ecd1fa7955b14f87bf367a61b6232511",
+                "sha256:ce584af5de8830d8701b8979b18fcf450cef9a382b1a3c8ef189bedc408faf1e",
+                "sha256:da456eeec17fa8aa4594d9a9f27c0b1060b6a75f2419fe0c00609587b2695f4a",
+                "sha256:db6db0f45d2c63ddb1a9d18d1b9b22f308e52c83638c26b422d520a815c4b3fb",
+                "sha256:df89642981b94e7db5596818499c4b2219028f2a528c9c37cc1de45bf2fd3a3f",
+                "sha256:f18d68f2be6bf0e89f1521af2b1bb46e66ab0018faafa81d70f358153170a317",
+                "sha256:f379b7f83f23fe12823085cd6b906edc49df969eb99757f58ff382349a3303c6"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==1.6.0"
+            "version": "==1.5.1"
         }
     },
     "develop": {
@@ -716,11 +723,11 @@
         },
         "attrs": {
             "hashes": [
-                "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594",
-                "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.2.0"
+            "version": "==20.3.0"
         },
         "cfgv": {
             "hashes": [
@@ -786,19 +793,19 @@
         },
         "flake8": {
             "hashes": [
-                "sha256:15e351d19611c887e482fb960eae4d44845013cc142d42896e9862f775d8cf5c",
-                "sha256:f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208"
+                "sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839",
+                "sha256:aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b"
             ],
             "index": "pypi",
-            "version": "==3.8.3"
+            "version": "==3.8.4"
         },
         "flake8-annotations": {
             "hashes": [
-                "sha256:09fe1aa3f40cb8fef632a0ab3614050a7584bb884b6134e70cf1fc9eeee642fa",
-                "sha256:5bda552f074fd6e34276c7761756fa07d824ffac91ce9c0a8555eb2bc5b92d7a"
+                "sha256:0bcebb0792f1f96d617ded674dca7bf64181870bfe5dace353a1483551f8e5f1",
+                "sha256:bebd11a850f6987a943ce8cdff4159767e0f5f89b3c88aca64680c2175ee02df"
             ],
             "index": "pypi",
-            "version": "==2.4.0"
+            "version": "==2.4.1"
         },
         "flake8-bugbear": {
             "hashes": [
@@ -856,11 +863,11 @@
         },
         "identify": {
             "hashes": [
-                "sha256:7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4",
-                "sha256:da683bfb7669fa749fc7731f378229e2dbf29a1d1337cbde04106f02236eb29d"
+                "sha256:5dd84ac64a9a115b8e0b27d1756b244b882ad264c3c423f42af8235a6e71ca12",
+                "sha256:c9504ba6a043ee2db0a9d69e43246bc138034895f6338d5aed1b41e4a73b1513"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.5.5"
+            "version": "==1.5.9"
         },
         "mccabe": {
             "hashes": [
@@ -886,11 +893,11 @@
         },
         "pre-commit": {
             "hashes": [
-                "sha256:810aef2a2ba4f31eed1941fc270e72696a1ad5590b9751839c90807d0fff6b9a",
-                "sha256:c54fd3e574565fe128ecc5e7d2f91279772ddb03f8729645fa812fe809084a70"
+                "sha256:22e6aa3bd571debb01eb7d34483f11c01b65237be4eebbf30c3d4fb65762d315",
+                "sha256:905ebc9b534b991baec87e934431f2d0606ba27f2b90f7f652985f5a5b8b6ae6"
             ],
             "index": "pypi",
-            "version": "==2.7.1"
+            "version": "==2.8.2"
         },
         "pycodestyle": {
             "hashes": [
@@ -950,26 +957,19 @@
         },
         "toml": {
             "hashes": [
-                "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f",
-                "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88"
+                "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
+                "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
             ],
-            "version": "==0.10.1"
-        },
-        "unittest-xml-reporting": {
-            "hashes": [
-                "sha256:7bf515ea8cb244255a25100cd29db611a73f8d3d0aaf672ed3266307e14cc1ca",
-                "sha256:984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695"
-            ],
-            "index": "pypi",
-            "version": "==3.0.4"
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==0.10.2"
         },
         "virtualenv": {
             "hashes": [
-                "sha256:43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc",
-                "sha256:e0305af10299a7fb0d69393d8f04cb2965dda9351140d11ac8db4e5e3970451b"
+                "sha256:b0011228208944ce71052987437d3843e05690b2f23d1c7da4263fde104c97a2",
+                "sha256:b8d6110f493af256a40d65e29846c69340a947669eec8ce784fcf3dd3af28380"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.0.31"
+            "version": "==20.1.0"
         }
     }
 }
diff --git a/README.md b/README.md
index b37ece296..482ada08c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,8 @@
 # Python Utility Bot
 
 [![Discord](https://img.shields.io/static/v1?label=Python%20Discord&logo=discord&message=%3E100k%20members&color=%237289DA&logoColor=white)](https://discord.gg/2B963hn)
-[![Build Status](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Bot?branchName=master)](https://dev.azure.com/python-discord/Python%20Discord/_build/latest?definitionId=1&branchName=master)
-[![Tests](https://img.shields.io/azure-devops/tests/python-discord/Python%20Discord/1?compact_message)](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Bot?branchName=master)
-[![Coverage](https://img.shields.io/azure-devops/coverage/python-discord/Python%20Discord/1/master)](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Bot?branchName=master)
+![Lint, Test, Build](https://github.com/python-discord/bot/workflows/Lint,%20Test,%20Build/badge.svg?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/python-discord/bot/badge.svg)](https://coveralls.io/github/python-discord/bot)
 [![License](https://img.shields.io/github/license/python-discord/bot)](LICENSE)
 [![Website](https://img.shields.io/badge/website-visit-brightgreen)](https://pythondiscord.com)
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 188ad7f93..000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-# https://aka.ms/yaml
-
-variables:
-  PIP_NO_CACHE_DIR: false
-  PIP_USER: 1
-  PIPENV_HIDE_EMOJIS: 1
-  PIPENV_IGNORE_VIRTUALENVS: 1
-  PIPENV_NOSPIN: 1
-  PRE_COMMIT_HOME: $(Pipeline.Workspace)/pre-commit-cache
-  PYTHONUSERBASE: $(Pipeline.Workspace)/py-user-base
-
-jobs:
-  - job: test
-    displayName: 'Lint & Test'
-    pool:
-      vmImage: ubuntu-18.04
-
-    variables:
-      BOT_API_KEY: foo
-      BOT_SENTRY_DSN: blah
-      BOT_TOKEN: bar
-      REDDIT_CLIENT_ID: spam
-      REDDIT_SECRET: ham
-      REDIS_PASSWORD: ''
-
-    steps:
-      - task: UsePythonVersion@0
-        displayName: 'Set Python version'
-        name: python
-        inputs:
-          versionSpec: '3.8.x'
-          addToPath: true
-
-      - task: Cache@2
-        displayName: 'Restore Python environment'
-        inputs:
-          key: python | $(Agent.OS) | "$(python.pythonLocation)" | 2 | ./Pipfile | ./Pipfile.lock
-          cacheHitVar: PY_ENV_RESTORED
-          path: $(PYTHONUSERBASE)
-
-      - script: echo '##vso[task.prependpath]$(PYTHONUSERBASE)/bin'
-        displayName: 'Prepend PATH'
-
-      - script: pip install pipenv
-        displayName: 'Install pipenv'
-        condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
-
-      - script: pipenv install --dev --deploy --system
-        displayName: 'Install project using pipenv'
-        condition: and(succeeded(), ne(variables.PY_ENV_RESTORED, 'true'))
-
-      # Create an executable shell script which replaces the original pipenv binary.
-      # The shell script ignores the first argument and executes the rest of the args as a command.
-      # It makes the `pipenv run flake8` command in the pre-commit hook work by circumventing
-      # pipenv entirely, which is too dumb to know it should use the system interpreter rather than
-      # creating a new venv.
-      - script: |
-          printf '%s\n%s' '#!/bin/bash' '"${@:2}"' > $(python.pythonLocation)/bin/pipenv \
-          && chmod +x $(python.pythonLocation)/bin/pipenv
-        displayName: 'Mock pipenv binary'
-
-      - task: Cache@2
-        displayName: 'Restore pre-commit environment'
-        inputs:
-          key: pre-commit | "$(python.pythonLocation)" | 0 | .pre-commit-config.yaml
-          path: $(PRE_COMMIT_HOME)
-
-      # pre-commit's venv doesn't allow user installs - not that they're really needed anyway.
-      - script: export PIP_USER=0; pre-commit run --all-files
-        displayName: 'Run pre-commit hooks'
-
-      - script: coverage run -m xmlrunner
-        displayName: Run tests
-
-      - script: coverage report -m && coverage xml -o coverage.xml
-        displayName: Generate test coverage report
-
-      - task: PublishCodeCoverageResults@1
-        displayName: 'Publish Coverage Results'
-        condition: succeededOrFailed()
-        inputs:
-          codeCoverageTool: Cobertura
-          summaryFileLocation: coverage.xml
-
-      - task: PublishTestResults@2
-        condition: succeededOrFailed()
-        displayName: 'Publish Test Results'
-        inputs:
-          testResultsFiles: '**/TEST-*.xml'
-          testRunTitle: 'Bot Test Results'
-
-  - job: build
-    displayName: 'Build & Push Container'
-    dependsOn: 'test'
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-
-    steps:
-      - task: Docker@2
-        displayName: 'Build & Push Container'
-        inputs:
-          containerRegistry: 'DockerHub'
-          repository: 'pythondiscord/bot'
-          command: 'buildAndPush'
-          Dockerfile: 'Dockerfile'
-          buildContext: '.'
-          tags: 'latest'
-- 
cgit v1.2.3