From 831f7566e9b0cd78256f7ff90da30c4d42a0e7b9 Mon Sep 17 00:00:00 2001 From: Andrei Date: Sat, 17 Jun 2017 04:51:29 -0700 Subject: [PATCH] Remove requirement around pyyaml, bump gevent --- disco/cli.py | 2 +- requirements.txt | 3 +-- setup.py | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/disco/cli.py b/disco/cli.py index 4d69cbb..7e54333 100644 --- a/disco/cli.py +++ b/disco/cli.py @@ -14,7 +14,7 @@ from gevent import monkey monkey.patch_all() parser = argparse.ArgumentParser() -parser.add_argument('--config', help='Configuration file', default='config.yaml') +parser.add_argument('--config', help='Configuration file', default='config.json') parser.add_argument('--token', help='Bot Authentication Token', default=None) parser.add_argument('--shard-count', help='Total number of shards', default=None) parser.add_argument('--shard-id', help='Current shard number/id', default=None) diff --git a/requirements.txt b/requirements.txt index 40a45c3..4228bdf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ -gevent==1.2.1 +gevent==1.2.2 holster==1.0.15 requests==2.13.0 six==1.10.0 websocket-client==0.40.0 -pyyaml==3.12 diff --git a/setup.py b/setup.py index 7f4488b..dd4b3b6 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,7 @@ with open('README.md') as f: extras_require = { 'voice': ['pynacl==1.1.2'], 'http': ['flask==0.12.2'], + 'yaml': ['pyyaml==3.12'], 'music': ['youtube_dl==2017.4.26'], 'performance': ['erlpack==0.3.2', 'ujson==1.35'], 'sharding': ['gipc==0.6.0'],