Rearranged project so it could be packaged easily

doc_update
Joey Hines 2019-05-10 20:29:44 -05:00
parent f357506054
commit c560aaf2f2
75 changed files with 37 additions and 9 deletions

2
.gitignore vendored
View File

@ -1,2 +1,4 @@
*.pyc
__pycache__/*
/dist/*
/GeoffreyApp.egg-info/*

View File

@ -0,0 +1,2 @@
default_app_config = 'GeoffreyApp.apps.GeoffreyAppConfig'
__version__ = '2.0'

View File

@ -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)),
],
),

View File

Before

Width:  |  Height:  |  Size: 294 KiB

After

Width:  |  Height:  |  Size: 294 KiB

View File

@ -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()

View File

View File

@ -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.

View File

@ -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):

View File

@ -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"

View File

@ -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"

View File

@ -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'),

4
MANIFEST.in 100644
View File

@ -0,0 +1,4 @@
include LICENSE
include README.md
recursive-include GeoffreyApp/static *
recursive-include GeoffreyApp/templates *

View File

@ -1 +0,0 @@
default_app_config = 'GeoffreyApp.apps.GeoffreyAppConfig'

22
setup.py 100644
View File

@ -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']
)