[V3] Pin discord.py for beta 16 release (#1848)

* Update main requirements

* Update docs requirements

* Black reformat after version update

* Pin dpy  in docs

Pipfile

@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-"discord.py" = { git = 'git://github.com/Rapptz/discord.py', ref = 'rewrite', editable = true}
+"discord.py" = { git = 'git://github.com/Rapptz/discord.py', ref = '7eb918b19e3e60b56eb9039eb267f8f3477c5e17', editable = true}
 "e1839a8" = {path = ".", editable = true}
 
 [dev-packages]

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b6f739015def0fc7efb2b9aab7b0cc7e21d88e56b9b73f8611669d8c0814bc64"
+            "sha256": "dcd688e81a2d0e793236e0335eb7cb9558d8b4acb66934afffcc0612cce2ec53"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -70,7 +70,7 @@
         "discord.py": {
             "editable": true,
             "git": "git://github.com/Rapptz/discord.py",
-            "ref": "rewrite"
+            "ref": "7eb918b19e3e60b56eb9039eb267f8f3477c5e17"
         },
         "distro": {
             "hashes": [
@@ -235,11 +235,11 @@
         },
         "black": {
             "hashes": [
-                "sha256:c956857a831e508e75f0dc754b86982bad98d95c96aae39c20749209b3958ad7",
+                "sha256:3efe92eafbde15f8ac06478de11cfb84e47504896ccdde64507e751d2f91ec3a",
-                "sha256:fa8d4b58aeb454443d4ef02c9daa615cd9a241f0cbe5f2b38b5965209d26dd1c"
+                "sha256:fc26c4ab28c541fb824f59fa83d5702f75829495d5a1dee603b29bc4fbe79095"
             ],
             "index": "pypi",
-            "version": "==18.5b1"
+            "version": "==18.6b2"
         },
         "certifi": {
             "hashes": [
@@ -348,11 +348,11 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:39555d023af3200d004d09e51b4dd9fdd828baa863cded3fd6ba2f29f757ae2d",
+                "sha256:26838b2bc58620e01675485491504c3aa7ee0faf335c37fcd5f8731ca4319591",
-                "sha256:c76e93f3145a44812955e8d46cdd302d8a45fbfc7bf22be24fe231f9d8d8853a"
+                "sha256:32c49a69566aa7c333188149ad48b58ac11a426d5352ea3d8f6ce843f88199cb"
             ],
             "index": "pypi",
-            "version": "==3.6.0"
+            "version": "==3.6.1"
         },
         "pytest-asyncio": {
             "hashes": [
@@ -400,11 +400,11 @@
         },
         "sphinx-rtd-theme": {
             "hashes": [
-                "sha256:32424dac2779f0840b4788fbccb032ba2496c1ca47a439ad2510c8b1e55dfd33",
+                "sha256:aa3e190392e963551432de7df24b8a5fbe5b71a2f4fcd9d5b75808b52ad999e5",
-                "sha256:6d0481532b5f441b075127a2d755f430f1f8410a50112b1af6b069518548381d"
+                "sha256:de88d637a60371d4f923e06b79c4ba260490c57d2ab5a8316942ab5d9a6ce1bf"
             ],
             "index": "pypi",
-            "version": "==0.3.1"
+            "version": "==0.4.0"
         },
         "sphinxcontrib-asyncio": {
             "hashes": [
@@ -415,10 +415,16 @@
         },
         "sphinxcontrib-websupport": {
             "hashes": [
-                "sha256:7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9",
+                "sha256:68ca7ff70785cbe1e7bccc71a48b5b6d965d79ca50629606c7861a21b206d9dd",
-                "sha256:f4932e95869599b89bf4f80fc3989132d83c9faa5bf633e7b5e0c25dffb75da2"
+                "sha256:9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9"
             ],
-            "version": "==1.0.1"
+            "version": "==1.1.0"
+        },
+        "toml": {
+            "hashes": [
+                "sha256:8e86bd6ce8cc11b9620cb637466453d94f5d57ad86f17e98a98d1f73e3baab2d"
+            ],
+            "version": "==0.9.4"
         },
         "tox": {
             "hashes": [

docs/requirements.txt

@@ -1,30 +1,37 @@
 -i https://pypi.org/simple
 alabaster==0.7.10
+appdirs==1.4.3
+atomicwrites==1.1.5
 attrs==18.1.0
-babel==2.5.3
+babel==2.6.0
+black==18.6b2
 certifi==2018.4.16
 chardet==3.0.4
+click==6.7
 docutils==0.14
 idna==2.6
 imagesize==1.0.0
 jinja2==2.10
 markupsafe==1.0
-more-itertools==4.1.0
+more-itertools==4.2.0
 packaging==17.1
 pluggy==0.6.0
 py==1.5.3
 pygments==2.2.0
 pyparsing==2.2.0
 pytest-asyncio==0.8.0
-pytest==3.5.1
+pytest==3.6.1
 pytz==2018.4
 requests==2.18.4
 six==1.11.0
 snowballstemmer==1.2.1
-sphinx-rtd-theme==0.3.1
+sphinx-rtd-theme==0.4.0
-sphinx==1.7.4
+sphinx==1.7.5
 sphinxcontrib-asyncio==0.2.0
-sphinxcontrib-websupport==1.0.1
+sphinxcontrib-websupport==1.1.0
+toml==0.9.4
+tox==3.0.0
 urllib3==1.22
+virtualenv==16.0.0
 yarl==0.18.0
-git+https://github.com/Rapptz/discord.py@rewrite#egg=discord.py-1.0
+git+https://github.com/Rapptz/discord.py@7eb918b19e3e60b56eb9039eb267f8f3477c5e17#egg=discord.py-1.0

redbot/cogs/warnings/helpers.py

@@ -69,8 +69,9 @@ def get_command_from_input(bot, userinput: str):
     check_str = inspect.getsource(checks.is_owner)
     if any(inspect.getsource(x) in check_str for x in com.checks):
         # command the user specified has the is_owner check
-        return None, _(
+        return (
-            "That command requires bot owner. I can't allow you to use that for an action"
+            None,
+            _("That command requires bot owner. I can't allow you to use that for an action"),
         )
     return "{prefix}" + orig, None
 

setup.py

@@ -14,7 +14,9 @@ IS_TRAVIS = "TRAVIS" in os.environ
 IS_DEPLOYING = "DEPLOYING" in os.environ
 IS_RTD = "READTHEDOCS" in os.environ
 
-dep_links = ["https://github.com/Rapptz/discord.py/tarball/rewrite#egg=discord.py-1.0"]
+dep_links = [
+    "https://github.com/Rapptz/discord.py/tarball/7eb918b19e3e60b56eb9039eb267f8f3477c5e17#egg=discord.py-1.0"
+]
 if IS_TRAVIS:
     dep_links = []