From c7eed7fe710332ce14f52c2c2fccf113816564d5 Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Mon, 20 Aug 2018 17:54:14 -0500 Subject: [PATCH] Added setup.py and reorganized the project. --- README.txt | 4 ++++ BotConfig.py => geoffrey/BotConfig.py | 0 BotErrors.py => geoffrey/BotErrors.py | 0 Commands.py => geoffrey/Commands.py | 0 .../DatabaseInterface.py | 0 DatabaseModels.py => geoffrey/DatabaseModels.py | 0 .../DiscordHelperFunctions.py | 0 Geoffrey.py => geoffrey/Geoffrey.py | 0 .../MinecraftAccountInfoGrabber.py | 0 geoffrey/__init__.py | 2 ++ bot.py => geoffrey/bot.py | 0 {cogs => geoffrey/cogs}/Add_Commands.py | 0 {cogs => geoffrey/cogs}/Admin_Commands.py | 0 {cogs => geoffrey/cogs}/Delete_Commands.py | 0 {cogs => geoffrey/cogs}/Edit_Commands.py | 0 {cogs => geoffrey/cogs}/Search_Commands.py | 0 {tests => geoffrey/tests}/test_commands.py | 0 {tests => geoffrey/tests}/test_geoffreyDatabase.py | 0 {tests => geoffrey/tests}/test_get_nickname.py | 0 .../tests}/test_minecraftInfoGrabber.py | 0 {tests => geoffrey/tests}/test_stress.py | 0 setup.py | 13 +++++++++++++ 22 files changed, 19 insertions(+) create mode 100644 README.txt rename BotConfig.py => geoffrey/BotConfig.py (100%) rename BotErrors.py => geoffrey/BotErrors.py (100%) rename Commands.py => geoffrey/Commands.py (100%) rename DatabaseInterface.py => geoffrey/DatabaseInterface.py (100%) rename DatabaseModels.py => geoffrey/DatabaseModels.py (100%) rename DiscordHelperFunctions.py => geoffrey/DiscordHelperFunctions.py (100%) rename Geoffrey.py => geoffrey/Geoffrey.py (100%) rename MinecraftAccountInfoGrabber.py => geoffrey/MinecraftAccountInfoGrabber.py (100%) create mode 100644 geoffrey/__init__.py rename bot.py => geoffrey/bot.py (100%) rename {cogs => geoffrey/cogs}/Add_Commands.py (100%) rename {cogs => geoffrey/cogs}/Admin_Commands.py (100%) rename {cogs => geoffrey/cogs}/Delete_Commands.py (100%) rename {cogs => geoffrey/cogs}/Edit_Commands.py (100%) rename {cogs => geoffrey/cogs}/Search_Commands.py (100%) rename {tests => geoffrey/tests}/test_commands.py (100%) rename {tests => geoffrey/tests}/test_geoffreyDatabase.py (100%) rename {tests => geoffrey/tests}/test_get_nickname.py (100%) rename {tests => geoffrey/tests}/test_minecraftInfoGrabber.py (100%) rename {tests => geoffrey/tests}/test_stress.py (100%) create mode 100644 setup.py diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..1b4b74c --- /dev/null +++ b/README.txt @@ -0,0 +1,4 @@ +Geoffrey (pronounced JOFF-ree) started his life as an inside joke none of you will understand. +At some point, she was to become an airhorn bot. Now, they know where your stuff is. + +Please respect Geoffrey, the bot is very sensitive. diff --git a/BotConfig.py b/geoffrey/BotConfig.py similarity index 100% rename from BotConfig.py rename to geoffrey/BotConfig.py diff --git a/BotErrors.py b/geoffrey/BotErrors.py similarity index 100% rename from BotErrors.py rename to geoffrey/BotErrors.py diff --git a/Commands.py b/geoffrey/Commands.py similarity index 100% rename from Commands.py rename to geoffrey/Commands.py diff --git a/DatabaseInterface.py b/geoffrey/DatabaseInterface.py similarity index 100% rename from DatabaseInterface.py rename to geoffrey/DatabaseInterface.py diff --git a/DatabaseModels.py b/geoffrey/DatabaseModels.py similarity index 100% rename from DatabaseModels.py rename to geoffrey/DatabaseModels.py diff --git a/DiscordHelperFunctions.py b/geoffrey/DiscordHelperFunctions.py similarity index 100% rename from DiscordHelperFunctions.py rename to geoffrey/DiscordHelperFunctions.py diff --git a/Geoffrey.py b/geoffrey/Geoffrey.py similarity index 100% rename from Geoffrey.py rename to geoffrey/Geoffrey.py diff --git a/MinecraftAccountInfoGrabber.py b/geoffrey/MinecraftAccountInfoGrabber.py similarity index 100% rename from MinecraftAccountInfoGrabber.py rename to geoffrey/MinecraftAccountInfoGrabber.py diff --git a/geoffrey/__init__.py b/geoffrey/__init__.py new file mode 100644 index 0000000..7803cf5 --- /dev/null +++ b/geoffrey/__init__.py @@ -0,0 +1,2 @@ +__version__ = '1.0dev' + diff --git a/bot.py b/geoffrey/bot.py similarity index 100% rename from bot.py rename to geoffrey/bot.py diff --git a/cogs/Add_Commands.py b/geoffrey/cogs/Add_Commands.py similarity index 100% rename from cogs/Add_Commands.py rename to geoffrey/cogs/Add_Commands.py diff --git a/cogs/Admin_Commands.py b/geoffrey/cogs/Admin_Commands.py similarity index 100% rename from cogs/Admin_Commands.py rename to geoffrey/cogs/Admin_Commands.py diff --git a/cogs/Delete_Commands.py b/geoffrey/cogs/Delete_Commands.py similarity index 100% rename from cogs/Delete_Commands.py rename to geoffrey/cogs/Delete_Commands.py diff --git a/cogs/Edit_Commands.py b/geoffrey/cogs/Edit_Commands.py similarity index 100% rename from cogs/Edit_Commands.py rename to geoffrey/cogs/Edit_Commands.py diff --git a/cogs/Search_Commands.py b/geoffrey/cogs/Search_Commands.py similarity index 100% rename from cogs/Search_Commands.py rename to geoffrey/cogs/Search_Commands.py diff --git a/tests/test_commands.py b/geoffrey/tests/test_commands.py similarity index 100% rename from tests/test_commands.py rename to geoffrey/tests/test_commands.py diff --git a/tests/test_geoffreyDatabase.py b/geoffrey/tests/test_geoffreyDatabase.py similarity index 100% rename from tests/test_geoffreyDatabase.py rename to geoffrey/tests/test_geoffreyDatabase.py diff --git a/tests/test_get_nickname.py b/geoffrey/tests/test_get_nickname.py similarity index 100% rename from tests/test_get_nickname.py rename to geoffrey/tests/test_get_nickname.py diff --git a/tests/test_minecraftInfoGrabber.py b/geoffrey/tests/test_minecraftInfoGrabber.py similarity index 100% rename from tests/test_minecraftInfoGrabber.py rename to geoffrey/tests/test_minecraftInfoGrabber.py diff --git a/tests/test_stress.py b/geoffrey/tests/test_stress.py similarity index 100% rename from tests/test_stress.py rename to geoffrey/tests/test_stress.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..254c6b7 --- /dev/null +++ b/setup.py @@ -0,0 +1,13 @@ +from distutils.core import setup + +setup( + name='Geoffrey', + version=__import__('geoffrey').__version__, + packages=['geoffrey'], + install_requires=['discord.py', 'SQLAlchemy', 'pymysql'], + long_description=open('README.txt').read(), + entry_points={ + 'console_scripts': + ['geoffrey = geoffrey.Geoffrey:main', + ]} +)