From c560aaf2f24d562f4196456f98044db40e94d9fd Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Fri, 10 May 2019 20:29:44 -0500 Subject: [PATCH] Rearranged project so it could be packaged easily --- .gitignore | 2 ++ LICENSE => GeoffreyApp/LICENSE | 0 GeoffreyApp/__init__.py | 2 ++ admin.py => GeoffreyApp/admin.py | 0 {api => GeoffreyApp/api}/__init__.py | 0 {api => GeoffreyApp/api}/commands.py | 0 {api => GeoffreyApp/api}/models.py | 0 {api => GeoffreyApp/api}/urls.py | 0 {api => GeoffreyApp/api}/views.py | 0 apps.py => GeoffreyApp/apps.py | 0 .../background_tasks.py | 0 {docs => GeoffreyApp/docs}/.gitignore | 0 {docs => GeoffreyApp/docs}/Makefile | 0 {migrations => GeoffreyApp/docs}/__init__.py | 0 {docs => GeoffreyApp/docs}/make.bat | 0 .../docs/source}/__init__.py | 0 .../docs}/source/bot_quickstart.rst | 0 .../docs}/source/commands.rst | 0 {docs => GeoffreyApp/docs}/source/conf.py | 0 .../docs}/source/django_settings.rst | 0 .../docs}/source/getting_started.rst | 0 {docs => GeoffreyApp/docs}/source/index.rst | 0 {docs => GeoffreyApp/docs}/source/models.rst | 0 errors.py => GeoffreyApp/errors.py | 0 mcm_api.py => GeoffreyApp/mcm_api.py | 0 .../migrations}/0001_initial.py | 0 .../migrations}/0002_auto_20181229_2216.py | 0 .../migrations}/0003_apitoken.py | 3 ++- .../0004_apitoken_commands_perm.py | 0 .../migrations}/0005_auto_20190113_2255.py | 0 .../migrations}/0006_auto_20190131_1822.py | 0 .../migrations}/0007_town.py | 0 .../migrations}/0008_publicfarm_resource.py | 0 .../migrations}/0009_market.py | 0 .../migrations}/0010_pointofinterest.py | 0 .../minecraft_api.py | 0 models.py => GeoffreyApp/models.py | 0 .../static}/GeoffreyApp/css/bootstrap.css | 0 .../static}/GeoffreyApp/css/geoffrey.css | 0 .../static}/GeoffreyApp/img/icon.png | Bin .../templates}/GeoffreyApp/base.html | 0 .../templates}/GeoffreyApp/base_list.html | 0 .../templates}/GeoffreyApp/error.html | 0 .../templates}/GeoffreyApp/home.html | 0 .../GeoffreyApp/itemlisting_list.html | 0 .../GeoffreyApp/itemlisting_table.html | 0 .../templates}/GeoffreyApp/location.html | 0 .../GeoffreyApp/location_table.html | 0 .../templates}/GeoffreyApp/market.html | 0 .../templates}/GeoffreyApp/market_list.html | 0 .../templates}/GeoffreyApp/player.html | 0 .../templates}/GeoffreyApp/player_list.html | 0 .../templates}/GeoffreyApp/player_table.html | 0 .../GeoffreyApp/pointofinterest_list.html | 0 .../templates}/GeoffreyApp/publicfarm.html | 0 .../GeoffreyApp/publicfarm_list.html | 0 .../GeoffreyApp/resource_table.html | 0 .../templates}/GeoffreyApp/search.html | 0 .../templates}/GeoffreyApp/shop.html | 0 .../templates}/GeoffreyApp/shop_list.html | 0 .../templates}/GeoffreyApp/town.html | 0 .../templates}/GeoffreyApp/town_list.html | 0 .../templatetags}/__init__.py | 0 .../templatetags}/navbar.py | 1 - GeoffreyApp/test/__init__.py | 0 {test => GeoffreyApp/test}/test_commands.py | 3 +-- {test => GeoffreyApp/test}/test_key.py | 2 +- {test => GeoffreyApp/test}/test_mcm_api.py | 2 +- .../test}/test_minecraft_api.py | 2 +- urls.py => GeoffreyApp/urls.py | 2 +- util.py => GeoffreyApp/util.py | 0 views.py => GeoffreyApp/views.py | 0 MANIFEST.in | 4 ++++ __init__.py | 1 - setup.py | 22 ++++++++++++++++++ 75 files changed, 37 insertions(+), 9 deletions(-) rename LICENSE => GeoffreyApp/LICENSE (100%) create mode 100644 GeoffreyApp/__init__.py rename admin.py => GeoffreyApp/admin.py (100%) rename {api => GeoffreyApp/api}/__init__.py (100%) rename {api => GeoffreyApp/api}/commands.py (100%) rename {api => GeoffreyApp/api}/models.py (100%) rename {api => GeoffreyApp/api}/urls.py (100%) rename {api => GeoffreyApp/api}/views.py (100%) rename apps.py => GeoffreyApp/apps.py (100%) rename background_tasks.py => GeoffreyApp/background_tasks.py (100%) rename {docs => GeoffreyApp/docs}/.gitignore (100%) rename {docs => GeoffreyApp/docs}/Makefile (100%) rename {migrations => GeoffreyApp/docs}/__init__.py (100%) rename {docs => GeoffreyApp/docs}/make.bat (100%) rename {templatetags => GeoffreyApp/docs/source}/__init__.py (100%) rename {docs => GeoffreyApp/docs}/source/bot_quickstart.rst (100%) rename {docs => GeoffreyApp/docs}/source/commands.rst (100%) rename {docs => GeoffreyApp/docs}/source/conf.py (100%) rename {docs => GeoffreyApp/docs}/source/django_settings.rst (100%) rename {docs => GeoffreyApp/docs}/source/getting_started.rst (100%) rename {docs => GeoffreyApp/docs}/source/index.rst (100%) rename {docs => GeoffreyApp/docs}/source/models.rst (100%) rename errors.py => GeoffreyApp/errors.py (100%) rename mcm_api.py => GeoffreyApp/mcm_api.py (100%) rename {migrations => GeoffreyApp/migrations}/0001_initial.py (100%) rename {migrations => GeoffreyApp/migrations}/0002_auto_20181229_2216.py (100%) rename {migrations => GeoffreyApp/migrations}/0003_apitoken.py (79%) rename {migrations => GeoffreyApp/migrations}/0004_apitoken_commands_perm.py (100%) rename {migrations => GeoffreyApp/migrations}/0005_auto_20190113_2255.py (100%) rename {migrations => GeoffreyApp/migrations}/0006_auto_20190131_1822.py (100%) rename {migrations => GeoffreyApp/migrations}/0007_town.py (100%) rename {migrations => GeoffreyApp/migrations}/0008_publicfarm_resource.py (100%) rename {migrations => GeoffreyApp/migrations}/0009_market.py (100%) rename {migrations => GeoffreyApp/migrations}/0010_pointofinterest.py (100%) rename minecraft_api.py => GeoffreyApp/minecraft_api.py (100%) rename models.py => GeoffreyApp/models.py (100%) rename {static => GeoffreyApp/static}/GeoffreyApp/css/bootstrap.css (100%) rename {static => GeoffreyApp/static}/GeoffreyApp/css/geoffrey.css (100%) rename {static => GeoffreyApp/static}/GeoffreyApp/img/icon.png (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/base.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/base_list.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/error.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/home.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/itemlisting_list.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/itemlisting_table.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/location.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/location_table.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/market.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/market_list.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/player.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/player_list.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/player_table.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/pointofinterest_list.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/publicfarm.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/publicfarm_list.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/resource_table.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/search.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/shop.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/shop_list.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/town.html (100%) rename {templates => GeoffreyApp/templates}/GeoffreyApp/town_list.html (100%) rename {test => GeoffreyApp/templatetags}/__init__.py (100%) rename {templatetags => GeoffreyApp/templatetags}/navbar.py (90%) create mode 100644 GeoffreyApp/test/__init__.py rename {test => GeoffreyApp/test}/test_commands.py (99%) rename {test => GeoffreyApp/test}/test_key.py (70%) rename {test => GeoffreyApp/test}/test_mcm_api.py (86%) rename {test => GeoffreyApp/test}/test_minecraft_api.py (75%) rename urls.py => GeoffreyApp/urls.py (98%) rename util.py => GeoffreyApp/util.py (100%) rename views.py => GeoffreyApp/views.py (100%) create mode 100644 MANIFEST.in delete mode 100644 __init__.py create mode 100644 setup.py diff --git a/.gitignore b/.gitignore index d42fd7d..9472d91 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.pyc __pycache__/* +/dist/* +/GeoffreyApp.egg-info/* \ No newline at end of file diff --git a/LICENSE b/GeoffreyApp/LICENSE similarity index 100% rename from LICENSE rename to GeoffreyApp/LICENSE diff --git a/GeoffreyApp/__init__.py b/GeoffreyApp/__init__.py new file mode 100644 index 0000000..25f7afd --- /dev/null +++ b/GeoffreyApp/__init__.py @@ -0,0 +1,2 @@ +default_app_config = 'GeoffreyApp.apps.GeoffreyAppConfig' +__version__ = '2.0' diff --git a/admin.py b/GeoffreyApp/admin.py similarity index 100% rename from admin.py rename to GeoffreyApp/admin.py diff --git a/api/__init__.py b/GeoffreyApp/api/__init__.py similarity index 100% rename from api/__init__.py rename to GeoffreyApp/api/__init__.py diff --git a/api/commands.py b/GeoffreyApp/api/commands.py similarity index 100% rename from api/commands.py rename to GeoffreyApp/api/commands.py diff --git a/api/models.py b/GeoffreyApp/api/models.py similarity index 100% rename from api/models.py rename to GeoffreyApp/api/models.py diff --git a/api/urls.py b/GeoffreyApp/api/urls.py similarity index 100% rename from api/urls.py rename to GeoffreyApp/api/urls.py diff --git a/api/views.py b/GeoffreyApp/api/views.py similarity index 100% rename from api/views.py rename to GeoffreyApp/api/views.py diff --git a/apps.py b/GeoffreyApp/apps.py similarity index 100% rename from apps.py rename to GeoffreyApp/apps.py diff --git a/background_tasks.py b/GeoffreyApp/background_tasks.py similarity index 100% rename from background_tasks.py rename to GeoffreyApp/background_tasks.py diff --git a/docs/.gitignore b/GeoffreyApp/docs/.gitignore similarity index 100% rename from docs/.gitignore rename to GeoffreyApp/docs/.gitignore diff --git a/docs/Makefile b/GeoffreyApp/docs/Makefile similarity index 100% rename from docs/Makefile rename to GeoffreyApp/docs/Makefile diff --git a/migrations/__init__.py b/GeoffreyApp/docs/__init__.py similarity index 100% rename from migrations/__init__.py rename to GeoffreyApp/docs/__init__.py diff --git a/docs/make.bat b/GeoffreyApp/docs/make.bat similarity index 100% rename from docs/make.bat rename to GeoffreyApp/docs/make.bat diff --git a/templatetags/__init__.py b/GeoffreyApp/docs/source/__init__.py similarity index 100% rename from templatetags/__init__.py rename to GeoffreyApp/docs/source/__init__.py diff --git a/docs/source/bot_quickstart.rst b/GeoffreyApp/docs/source/bot_quickstart.rst similarity index 100% rename from docs/source/bot_quickstart.rst rename to GeoffreyApp/docs/source/bot_quickstart.rst diff --git a/docs/source/commands.rst b/GeoffreyApp/docs/source/commands.rst similarity index 100% rename from docs/source/commands.rst rename to GeoffreyApp/docs/source/commands.rst diff --git a/docs/source/conf.py b/GeoffreyApp/docs/source/conf.py similarity index 100% rename from docs/source/conf.py rename to GeoffreyApp/docs/source/conf.py diff --git a/docs/source/django_settings.rst b/GeoffreyApp/docs/source/django_settings.rst similarity index 100% rename from docs/source/django_settings.rst rename to GeoffreyApp/docs/source/django_settings.rst diff --git a/docs/source/getting_started.rst b/GeoffreyApp/docs/source/getting_started.rst similarity index 100% rename from docs/source/getting_started.rst rename to GeoffreyApp/docs/source/getting_started.rst diff --git a/docs/source/index.rst b/GeoffreyApp/docs/source/index.rst similarity index 100% rename from docs/source/index.rst rename to GeoffreyApp/docs/source/index.rst diff --git a/docs/source/models.rst b/GeoffreyApp/docs/source/models.rst similarity index 100% rename from docs/source/models.rst rename to GeoffreyApp/docs/source/models.rst diff --git a/errors.py b/GeoffreyApp/errors.py similarity index 100% rename from errors.py rename to GeoffreyApp/errors.py diff --git a/mcm_api.py b/GeoffreyApp/mcm_api.py similarity index 100% rename from mcm_api.py rename to GeoffreyApp/mcm_api.py diff --git a/migrations/0001_initial.py b/GeoffreyApp/migrations/0001_initial.py similarity index 100% rename from migrations/0001_initial.py rename to GeoffreyApp/migrations/0001_initial.py diff --git a/migrations/0002_auto_20181229_2216.py b/GeoffreyApp/migrations/0002_auto_20181229_2216.py similarity index 100% rename from migrations/0002_auto_20181229_2216.py rename to GeoffreyApp/migrations/0002_auto_20181229_2216.py diff --git a/migrations/0003_apitoken.py b/GeoffreyApp/migrations/0003_apitoken.py similarity index 79% rename from migrations/0003_apitoken.py rename to GeoffreyApp/migrations/0003_apitoken.py index 16816f0..e024438 100644 --- a/migrations/0003_apitoken.py +++ b/GeoffreyApp/migrations/0003_apitoken.py @@ -14,7 +14,8 @@ class Migration(migrations.Migration): name='APIToken', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('key', models.CharField(default=GeoffreyApp.util.create_token, max_length=25, unique=True)), + ( + 'key', models.CharField(default=GeoffreyApp.GeoffreyApp.util.create_token, max_length=25, unique=True)), ('name', models.CharField(blank=True, max_length=50)), ], ), diff --git a/migrations/0004_apitoken_commands_perm.py b/GeoffreyApp/migrations/0004_apitoken_commands_perm.py similarity index 100% rename from migrations/0004_apitoken_commands_perm.py rename to GeoffreyApp/migrations/0004_apitoken_commands_perm.py diff --git a/migrations/0005_auto_20190113_2255.py b/GeoffreyApp/migrations/0005_auto_20190113_2255.py similarity index 100% rename from migrations/0005_auto_20190113_2255.py rename to GeoffreyApp/migrations/0005_auto_20190113_2255.py diff --git a/migrations/0006_auto_20190131_1822.py b/GeoffreyApp/migrations/0006_auto_20190131_1822.py similarity index 100% rename from migrations/0006_auto_20190131_1822.py rename to GeoffreyApp/migrations/0006_auto_20190131_1822.py diff --git a/migrations/0007_town.py b/GeoffreyApp/migrations/0007_town.py similarity index 100% rename from migrations/0007_town.py rename to GeoffreyApp/migrations/0007_town.py diff --git a/migrations/0008_publicfarm_resource.py b/GeoffreyApp/migrations/0008_publicfarm_resource.py similarity index 100% rename from migrations/0008_publicfarm_resource.py rename to GeoffreyApp/migrations/0008_publicfarm_resource.py diff --git a/migrations/0009_market.py b/GeoffreyApp/migrations/0009_market.py similarity index 100% rename from migrations/0009_market.py rename to GeoffreyApp/migrations/0009_market.py diff --git a/migrations/0010_pointofinterest.py b/GeoffreyApp/migrations/0010_pointofinterest.py similarity index 100% rename from migrations/0010_pointofinterest.py rename to GeoffreyApp/migrations/0010_pointofinterest.py diff --git a/minecraft_api.py b/GeoffreyApp/minecraft_api.py similarity index 100% rename from minecraft_api.py rename to GeoffreyApp/minecraft_api.py diff --git a/models.py b/GeoffreyApp/models.py similarity index 100% rename from models.py rename to GeoffreyApp/models.py diff --git a/static/GeoffreyApp/css/bootstrap.css b/GeoffreyApp/static/GeoffreyApp/css/bootstrap.css similarity index 100% rename from static/GeoffreyApp/css/bootstrap.css rename to GeoffreyApp/static/GeoffreyApp/css/bootstrap.css diff --git a/static/GeoffreyApp/css/geoffrey.css b/GeoffreyApp/static/GeoffreyApp/css/geoffrey.css similarity index 100% rename from static/GeoffreyApp/css/geoffrey.css rename to GeoffreyApp/static/GeoffreyApp/css/geoffrey.css diff --git a/static/GeoffreyApp/img/icon.png b/GeoffreyApp/static/GeoffreyApp/img/icon.png similarity index 100% rename from static/GeoffreyApp/img/icon.png rename to GeoffreyApp/static/GeoffreyApp/img/icon.png diff --git a/templates/GeoffreyApp/base.html b/GeoffreyApp/templates/GeoffreyApp/base.html similarity index 100% rename from templates/GeoffreyApp/base.html rename to GeoffreyApp/templates/GeoffreyApp/base.html diff --git a/templates/GeoffreyApp/base_list.html b/GeoffreyApp/templates/GeoffreyApp/base_list.html similarity index 100% rename from templates/GeoffreyApp/base_list.html rename to GeoffreyApp/templates/GeoffreyApp/base_list.html diff --git a/templates/GeoffreyApp/error.html b/GeoffreyApp/templates/GeoffreyApp/error.html similarity index 100% rename from templates/GeoffreyApp/error.html rename to GeoffreyApp/templates/GeoffreyApp/error.html diff --git a/templates/GeoffreyApp/home.html b/GeoffreyApp/templates/GeoffreyApp/home.html similarity index 100% rename from templates/GeoffreyApp/home.html rename to GeoffreyApp/templates/GeoffreyApp/home.html diff --git a/templates/GeoffreyApp/itemlisting_list.html b/GeoffreyApp/templates/GeoffreyApp/itemlisting_list.html similarity index 100% rename from templates/GeoffreyApp/itemlisting_list.html rename to GeoffreyApp/templates/GeoffreyApp/itemlisting_list.html diff --git a/templates/GeoffreyApp/itemlisting_table.html b/GeoffreyApp/templates/GeoffreyApp/itemlisting_table.html similarity index 100% rename from templates/GeoffreyApp/itemlisting_table.html rename to GeoffreyApp/templates/GeoffreyApp/itemlisting_table.html diff --git a/templates/GeoffreyApp/location.html b/GeoffreyApp/templates/GeoffreyApp/location.html similarity index 100% rename from templates/GeoffreyApp/location.html rename to GeoffreyApp/templates/GeoffreyApp/location.html diff --git a/templates/GeoffreyApp/location_table.html b/GeoffreyApp/templates/GeoffreyApp/location_table.html similarity index 100% rename from templates/GeoffreyApp/location_table.html rename to GeoffreyApp/templates/GeoffreyApp/location_table.html diff --git a/templates/GeoffreyApp/market.html b/GeoffreyApp/templates/GeoffreyApp/market.html similarity index 100% rename from templates/GeoffreyApp/market.html rename to GeoffreyApp/templates/GeoffreyApp/market.html diff --git a/templates/GeoffreyApp/market_list.html b/GeoffreyApp/templates/GeoffreyApp/market_list.html similarity index 100% rename from templates/GeoffreyApp/market_list.html rename to GeoffreyApp/templates/GeoffreyApp/market_list.html diff --git a/templates/GeoffreyApp/player.html b/GeoffreyApp/templates/GeoffreyApp/player.html similarity index 100% rename from templates/GeoffreyApp/player.html rename to GeoffreyApp/templates/GeoffreyApp/player.html diff --git a/templates/GeoffreyApp/player_list.html b/GeoffreyApp/templates/GeoffreyApp/player_list.html similarity index 100% rename from templates/GeoffreyApp/player_list.html rename to GeoffreyApp/templates/GeoffreyApp/player_list.html diff --git a/templates/GeoffreyApp/player_table.html b/GeoffreyApp/templates/GeoffreyApp/player_table.html similarity index 100% rename from templates/GeoffreyApp/player_table.html rename to GeoffreyApp/templates/GeoffreyApp/player_table.html diff --git a/templates/GeoffreyApp/pointofinterest_list.html b/GeoffreyApp/templates/GeoffreyApp/pointofinterest_list.html similarity index 100% rename from templates/GeoffreyApp/pointofinterest_list.html rename to GeoffreyApp/templates/GeoffreyApp/pointofinterest_list.html diff --git a/templates/GeoffreyApp/publicfarm.html b/GeoffreyApp/templates/GeoffreyApp/publicfarm.html similarity index 100% rename from templates/GeoffreyApp/publicfarm.html rename to GeoffreyApp/templates/GeoffreyApp/publicfarm.html diff --git a/templates/GeoffreyApp/publicfarm_list.html b/GeoffreyApp/templates/GeoffreyApp/publicfarm_list.html similarity index 100% rename from templates/GeoffreyApp/publicfarm_list.html rename to GeoffreyApp/templates/GeoffreyApp/publicfarm_list.html diff --git a/templates/GeoffreyApp/resource_table.html b/GeoffreyApp/templates/GeoffreyApp/resource_table.html similarity index 100% rename from templates/GeoffreyApp/resource_table.html rename to GeoffreyApp/templates/GeoffreyApp/resource_table.html diff --git a/templates/GeoffreyApp/search.html b/GeoffreyApp/templates/GeoffreyApp/search.html similarity index 100% rename from templates/GeoffreyApp/search.html rename to GeoffreyApp/templates/GeoffreyApp/search.html diff --git a/templates/GeoffreyApp/shop.html b/GeoffreyApp/templates/GeoffreyApp/shop.html similarity index 100% rename from templates/GeoffreyApp/shop.html rename to GeoffreyApp/templates/GeoffreyApp/shop.html diff --git a/templates/GeoffreyApp/shop_list.html b/GeoffreyApp/templates/GeoffreyApp/shop_list.html similarity index 100% rename from templates/GeoffreyApp/shop_list.html rename to GeoffreyApp/templates/GeoffreyApp/shop_list.html diff --git a/templates/GeoffreyApp/town.html b/GeoffreyApp/templates/GeoffreyApp/town.html similarity index 100% rename from templates/GeoffreyApp/town.html rename to GeoffreyApp/templates/GeoffreyApp/town.html diff --git a/templates/GeoffreyApp/town_list.html b/GeoffreyApp/templates/GeoffreyApp/town_list.html similarity index 100% rename from templates/GeoffreyApp/town_list.html rename to GeoffreyApp/templates/GeoffreyApp/town_list.html diff --git a/test/__init__.py b/GeoffreyApp/templatetags/__init__.py similarity index 100% rename from test/__init__.py rename to GeoffreyApp/templatetags/__init__.py diff --git a/templatetags/navbar.py b/GeoffreyApp/templatetags/navbar.py similarity index 90% rename from templatetags/navbar.py rename to GeoffreyApp/templatetags/navbar.py index f1787f5..6dde3c2 100644 --- a/templatetags/navbar.py +++ b/GeoffreyApp/templatetags/navbar.py @@ -1,6 +1,5 @@ from django import template from django.urls import reverse -from GeoffreyApp.models import Player, Shop, Base, Town, ItemListing, PublicFarm, Market, PointOfInterest register = template.Library() diff --git a/GeoffreyApp/test/__init__.py b/GeoffreyApp/test/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/test/test_commands.py b/GeoffreyApp/test/test_commands.py similarity index 99% rename from test/test_commands.py rename to GeoffreyApp/test/test_commands.py index fb5aabf..ed1831c 100644 --- a/test/test_commands.py +++ b/GeoffreyApp/test/test_commands.py @@ -1,6 +1,5 @@ from django.test import TestCase -from GeoffreyApp.api.commands import * -from GeoffreyApp.models import * +from GeoffreyApp.GeoffreyApp.models import * from time import sleep # Create your tests here. diff --git a/test/test_key.py b/GeoffreyApp/test/test_key.py similarity index 70% rename from test/test_key.py rename to GeoffreyApp/test/test_key.py index 580e454..dfcf376 100644 --- a/test/test_key.py +++ b/GeoffreyApp/test/test_key.py @@ -1,5 +1,5 @@ from django.test import TestCase -from GeoffreyApp.util import create_token +from GeoffreyApp.GeoffreyApp.util import create_token class TokenAPITestCase(TestCase): diff --git a/test/test_mcm_api.py b/GeoffreyApp/test/test_mcm_api.py similarity index 86% rename from test/test_mcm_api.py rename to GeoffreyApp/test/test_mcm_api.py index 7c74332..3d2d7fa 100644 --- a/test/test_mcm_api.py +++ b/GeoffreyApp/test/test_mcm_api.py @@ -1,5 +1,5 @@ from django.test import TestCase -from GeoffreyApp.mcm_api import get_player +from GeoffreyApp.GeoffreyApp.mcm_api import get_player # Create your tests here. UUID = "fe7e84132570458892032b69ff188bc3" diff --git a/test/test_minecraft_api.py b/GeoffreyApp/test/test_minecraft_api.py similarity index 75% rename from test/test_minecraft_api.py rename to GeoffreyApp/test/test_minecraft_api.py index 635be1e..fef59a9 100644 --- a/test/test_minecraft_api.py +++ b/GeoffreyApp/test/test_minecraft_api.py @@ -1,5 +1,5 @@ from django.test import TestCase -from GeoffreyApp.minecraft_api import grab_playername, grab_UUID +from GeoffreyApp.GeoffreyApp.minecraft_api import grab_playername, grab_UUID # Create your tests here. UUID = "fe7e84132570458892032b69ff188bc3" diff --git a/urls.py b/GeoffreyApp/urls.py similarity index 98% rename from urls.py rename to GeoffreyApp/urls.py index 77dc0c3..68b82c6 100644 --- a/urls.py +++ b/GeoffreyApp/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url from django.urls import path, include -from . import views +from GeoffreyApp import views urlpatterns = [ url(r'^home/$', views.Home.as_view(), name='GeoffreyHome'), diff --git a/util.py b/GeoffreyApp/util.py similarity index 100% rename from util.py rename to GeoffreyApp/util.py diff --git a/views.py b/GeoffreyApp/views.py similarity index 100% rename from views.py rename to GeoffreyApp/views.py diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..04f6a2d --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,4 @@ +include LICENSE +include README.md +recursive-include GeoffreyApp/static * +recursive-include GeoffreyApp/templates * diff --git a/__init__.py b/__init__.py deleted file mode 100644 index e935b77..0000000 --- a/__init__.py +++ /dev/null @@ -1 +0,0 @@ -default_app_config = 'GeoffreyApp.apps.GeoffreyAppConfig' \ No newline at end of file diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..d578770 --- /dev/null +++ b/setup.py @@ -0,0 +1,22 @@ +import os +from setuptools import find_packages, setup + +with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme: + README = readme.read() + +# allow setup.py to be run from any path +os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) + +setup( + name='GeoffreyApp', + version='2.0', + packages=find_packages(), + include_package_data=True, + license='MIT License', + description='Geoffrey: The Minecraft Information Database', + long_description=README, + url='https:/geoffrey.zerohighdef.com/', + author='ZeroHD', + author_email='zero@zerohighdef.com', + install_requires=['django', 'requests', 'simplejson'] +)