Merge pull request #12 from hhollenstain/fix-yt-dl-again

1.0.0 rewrite is now main part of discord.py

Makefile

@@ -1,6 +1,6 @@
 .PHONY: init check dist publish
 
-init: req
+init:
 	pipenv install -e "."
 	pipenv run python setup.py develop
 
@@ -9,16 +9,12 @@ check: test
 	pipenv run pylint setup.py
 	#pipenv run pylint tamago/*.py
 
-test: req
+test:
 	pipenv install -e ".[test]"
 	pipenv run python setup.py develop
 
 dist: init check req
 	pipenv run python setup.py sdist bdist_wheel install
 
 live:
-	pip install -U git+https://github.com/Rapptz/discord.py@rewrite#egg=discord.py
 	pip install -e "."
-
-req:
-	pipenv run pip install -U git+https://github.com/Rapptz/discord.py@rewrite#egg=discord.py

Pipfile

@@ -6,7 +6,7 @@ name = "pypi"
 [dev-packages]
 
 [packages]
-"e1839a8" = {path = ".", editable = true}
+"e1839a8" = {path = ".", extras = ["test"], editable = true}
 
 [requires]
 python_version = "3.6"

setup.py

@@ -8,6 +8,7 @@
     'asyncio',
     'aiomeasures',
     'coloredlogs',
+    'discord.py==1.1.1',
     'over_stats',
     'oyaml',
     'pip==18.0',
@@ -27,10 +28,6 @@
         ]
     }
 
-DEPENDENCY_LINKS = [
-    'git+https://github.com/Rapptz/discord.py@rewrite#egg=discord.py==1.0.0',
-]
-
 setup(
     name='tamago',
     version=tamago.VERSION,

tamago/__init__.py

@@ -1,5 +1,5 @@
 """
 init - version info
 """
-VERSION_INFO = (0, 2, 1)
+VERSION_INFO = (1, 0, 0)
 VERSION = '.'.join(str(c) for c in VERSION_INFO)

tamago/lib/plugins/crypto.py

@@ -7,7 +7,7 @@
 
 LOG = logging.getLogger(__name__)
 
-class Crypto:
+class Crypto(commands.Cog):
     def __init__(self, client):
         self.client = client
 

tamago/lib/plugins/fun.py

@@ -6,7 +6,7 @@
 
 LOG = logging.getLogger(__name__)
 
-class Fun:
+class Fun(commands.Cog):
     def __init__(self, tamago):
         self.tamago = tamago
 

tamago/lib/plugins/help.py

@@ -4,7 +4,7 @@
 
 LOG = logging.getLogger(__name__)
 
-class Help:
+class Help(commands.Cog):
     def __init__(self, client):
         self.client = client
         self.client.remove_command('help')

tamago/lib/plugins/mod_tools.py

@@ -5,7 +5,7 @@
 
 LOG = logging.getLogger(__name__)
 
-class ModTools:
+class ModTools(commands.Cog):
     def __init__(self, client):
         self.client = client
 

tamago/lib/plugins/music.py

@@ -180,7 +180,7 @@ def destroy(self, guild):
         return self.bot.loop.create_task(self._cog.cleanup(guild))
 
 
-class Music:
+class Music(commands.Cog):
     """Music related commands."""
 
     __slots__ = ('bot', 'players')

tamago/lib/plugins/ping.py

@@ -5,7 +5,13 @@
 
 LOG = logging.getLogger(__name__)
 
-class Ping:
+
+# class Greetings(commands.Cog):
+#     def __init__(self, bot):
+#         self.bot = bot
+#         self._last_member = None
+
+class Ping(commands.Cog):
     def __init__(self, client):
         self.client = client
 

tamago/lib/plugins/server.py

@@ -8,7 +8,7 @@
 
 LOG = logging.getLogger(__name__)
 
-class Server:
+class Server(commands.Cog):
     def __init__(self, client):
         self.client = client
 

tamago/lib/plugins/stats_overwatch.py

@@ -39,7 +39,7 @@
                   'top': 5,
                  }
 
-class StatsOverwatch:
+class StatsOverwatch(commands.Cog):
     def __init__(self, client):
         self.client = client
 

tamago/lib/plugins/voice.py

@@ -4,7 +4,7 @@
 
 LOG = logging.getLogger(__name__)
 
-class Voice:
+class Voice(commands.Cog):
     def __init__(self, client):
         self.client = client
 

tamago/lib/plugins/weather.py

@@ -63,7 +63,7 @@ def get_weather(location, owm_api_key):
 
     return weather
 
-class Weather:
+class Weather(commands.Cog):
     def __init__(self, tamago):
         self.tamago = tamago