From 9b6fd823dbab75f9bfcee6a20cb5a4b18d1ee4ae Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 6 May 2019 19:02:12 +0200 Subject: [PATCH] Update requirements --- requirements.txt | 1 + royalnet/__init__.py | 2 +- royalnet/royalgames.py | 4 ++++ setup.py | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 66cfada6..6c4fba73 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,4 @@ youtube_dl>=2019.4.24 ffmpeg-python>=0.1.17 Sphinx>=2.0.1 sphinx_rtd_theme>=0.4.3 +PyNaCl>=1.3.0 diff --git a/royalnet/__init__.py b/royalnet/__init__.py index f8fa0291..55c30958 100644 --- a/royalnet/__init__.py +++ b/royalnet/__init__.py @@ -1,5 +1,5 @@ from . import audio, bots, commands, database, network, utils, error -version = "5.0a4" +version = "5.0a5" __all__ = ["audio", "bots", "commands", "database", "network", "utils", "error"] diff --git a/royalnet/royalgames.py b/royalnet/royalgames.py index d98ab179..0d925386 100644 --- a/royalnet/royalgames.py +++ b/royalnet/royalgames.py @@ -24,9 +24,11 @@ commands = [PingCommand, ShipCommand, SmecdsCommand, ColorCommand, CiaoruoziComm address, port = "127.0.0.1", 1234 +print("Starting master...") master = RoyalnetServer(address, port, "sas") loop.run_until_complete(master.start()) +print("Starting bots...") ds_bot = DiscordBot(discord_config=DiscordConfig(os.environ["DS_AK"]), royalnet_config=RoyalnetConfig(f"ws://{address}:{port}", "sas"), database_config=DatabaseConfig(os.environ["DB_PATH"], Royal, Discord, "discord_id"), @@ -41,4 +43,6 @@ tg_bot = TelegramBot(telegram_config=TelegramConfig(os.environ["TG_AK"]), missing_command=MissingCommand) loop.create_task(tg_bot.run()) loop.create_task(ds_bot.run()) + +print("Running loop...") loop.run_forever() diff --git a/setup.py b/setup.py index ece45c2b..e9c7721e 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,8 @@ setuptools.setup( "dateparser>=0.7.1", "discord.py>=1.0.1", "youtube_dl>=2019.4.24", - "ffmpeg-python>=0.1.17"], + "ffmpeg-python>=0.1.17", + "PyNaCl>=1.3.0"], python_requires=">=3.7", classifiers=[ "Development Status :: 3 - Alpha",