From 2c0ae52fe5d2dcfb1992a309cf29f00f05717908 Mon Sep 17 00:00:00 2001
From: Tristan Gosselin-Hane <starcraft66@gmail.com>
Date: Sun, 22 Sep 2019 15:27:02 -0400
Subject: [PATCH] Make the project a valid python package

---
 minecraft-discord-bridge/__main__.py                           | 3 ---
 minecraft_discord_bridge/__init__.py                           | 1 +
 minecraft_discord_bridge/__main__.py                           | 3 +++
 .../auth_server.py                                             | 0
 .../config.py                                                  | 0
 .../database.py                                                | 0
 .../database_session.py                                        | 0
 .../elasticsearch_logger.py                                    | 0
 .../minecraft_discord_bridge.py                                | 2 +-
 9 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 minecraft-discord-bridge/__main__.py
 create mode 100644 minecraft_discord_bridge/__init__.py
 create mode 100644 minecraft_discord_bridge/__main__.py
 rename {minecraft-discord-bridge => minecraft_discord_bridge}/auth_server.py (100%)
 rename {minecraft-discord-bridge => minecraft_discord_bridge}/config.py (100%)
 rename {minecraft-discord-bridge => minecraft_discord_bridge}/database.py (100%)
 rename {minecraft-discord-bridge => minecraft_discord_bridge}/database_session.py (100%)
 rename {minecraft-discord-bridge => minecraft_discord_bridge}/elasticsearch_logger.py (100%)
 rename {minecraft-discord-bridge => minecraft_discord_bridge}/minecraft_discord_bridge.py (99%)

diff --git a/minecraft-discord-bridge/__main__.py b/minecraft-discord-bridge/__main__.py
deleted file mode 100644
index cdf0090..0000000
--- a/minecraft-discord-bridge/__main__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-if __name__ == "__main__":
-    from . import minecraft_discord_bridge
-    minecraft_discord_bridge.main()
diff --git a/minecraft_discord_bridge/__init__.py b/minecraft_discord_bridge/__init__.py
new file mode 100644
index 0000000..f102a9c
--- /dev/null
+++ b/minecraft_discord_bridge/__init__.py
@@ -0,0 +1 @@
+__version__ = "0.0.1"
diff --git a/minecraft_discord_bridge/__main__.py b/minecraft_discord_bridge/__main__.py
new file mode 100644
index 0000000..4653883
--- /dev/null
+++ b/minecraft_discord_bridge/__main__.py
@@ -0,0 +1,3 @@
+if __name__ == "__main__":
+    from minecraft_discord_bridge import minecraft_discord_bridge
+    minecraft_discord_bridge.main()
diff --git a/minecraft-discord-bridge/auth_server.py b/minecraft_discord_bridge/auth_server.py
similarity index 100%
rename from minecraft-discord-bridge/auth_server.py
rename to minecraft_discord_bridge/auth_server.py
diff --git a/minecraft-discord-bridge/config.py b/minecraft_discord_bridge/config.py
similarity index 100%
rename from minecraft-discord-bridge/config.py
rename to minecraft_discord_bridge/config.py
diff --git a/minecraft-discord-bridge/database.py b/minecraft_discord_bridge/database.py
similarity index 100%
rename from minecraft-discord-bridge/database.py
rename to minecraft_discord_bridge/database.py
diff --git a/minecraft-discord-bridge/database_session.py b/minecraft_discord_bridge/database_session.py
similarity index 100%
rename from minecraft-discord-bridge/database_session.py
rename to minecraft_discord_bridge/database_session.py
diff --git a/minecraft-discord-bridge/elasticsearch_logger.py b/minecraft_discord_bridge/elasticsearch_logger.py
similarity index 100%
rename from minecraft-discord-bridge/elasticsearch_logger.py
rename to minecraft_discord_bridge/elasticsearch_logger.py
diff --git a/minecraft-discord-bridge/minecraft_discord_bridge.py b/minecraft_discord_bridge/minecraft_discord_bridge.py
similarity index 99%
rename from minecraft-discord-bridge/minecraft_discord_bridge.py
rename to minecraft_discord_bridge/minecraft_discord_bridge.py
index 66fca38..b1029af 100755
--- a/minecraft-discord-bridge/minecraft_discord_bridge.py
+++ b/minecraft_discord_bridge/minecraft_discord_bridge.py
@@ -15,7 +15,7 @@ import string
 import uuid
 from threading import Thread
 from .config import Configuration
-from .database import DiscordChannel, AccountLinkToken, DiscordAccount
+from . import DiscordChannel, AccountLinkToken, DiscordAccount
 from . import database_session
 
 from datetime import datetime, timedelta, timezone