Remove old school project layout

artnez · Jan 21, 2014 · 00ea829 · 00ea829
1 parent 8ee1d54
commit 00ea829
Show file tree

Hide file tree

Showing 67 changed files with 9 additions and 65 deletions.
diff --git a/bin/handler.wsgi b/bin/handler.wsgi
diff --git a/src/faceoff/__init__.py → faceoff/__init__.py b/src/faceoff/__init__.py → faceoff/__init__.py
diff --git a/src/faceoff/cache.py → faceoff/cache.py b/src/faceoff/cache.py → faceoff/cache.py
diff --git a/src/faceoff/config.py → faceoff/config.py b/src/faceoff/config.py → faceoff/config.py
diff --git a/src/faceoff/db.py → faceoff/db.py b/src/faceoff/db.py → faceoff/db.py
@@ -18,7 +18,7 @@
 from hashlib import sha1
 from random import random, shuffle
 from time import time
-from natsort import natsort
+from natsort import natsorted
 from functools import wraps
 
 _curdir = os.path.dirname(__file__)
@@ -94,8 +94,7 @@ def get_schema_files(schema_path):
     Returns a list of schema SQL files, sorted by version number.
     """
     files = glob(os.path.join(schema_path, '*.sql'))
-    natsort(files)
-    return files
+    return natsorted(files)
 
 
 def get_schema_sql(schema_path):

diff --git a/src/faceoff/debug.py → faceoff/debug.py b/src/faceoff/debug.py → faceoff/debug.py
diff --git a/src/faceoff/fixtures.py → faceoff/fixtures.py b/src/faceoff/fixtures.py → faceoff/fixtures.py
diff --git a/src/faceoff/forms.py → faceoff/forms.py b/src/faceoff/forms.py → faceoff/forms.py
diff --git a/src/faceoff/helpers/__init__.py → faceoff/helpers/__init__.py b/src/faceoff/helpers/__init__.py → faceoff/helpers/__init__.py
diff --git a/src/faceoff/helpers/decorators.py → faceoff/helpers/decorators.py b/src/faceoff/helpers/decorators.py → faceoff/helpers/decorators.py
diff --git a/src/faceoff/helpers/validators.py → faceoff/helpers/validators.py b/src/faceoff/helpers/validators.py → faceoff/helpers/validators.py
diff --git a/src/faceoff/log.py → faceoff/log.py b/src/faceoff/log.py → faceoff/log.py
diff --git a/src/faceoff/models/__init__.py → faceoff/models/__init__.py b/src/faceoff/models/__init__.py → faceoff/models/__init__.py
diff --git a/src/faceoff/models/league.py → faceoff/models/league.py b/src/faceoff/models/league.py → faceoff/models/league.py
diff --git a/src/faceoff/models/match.py → faceoff/models/match.py b/src/faceoff/models/match.py → faceoff/models/match.py
diff --git a/src/faceoff/models/setting.py → faceoff/models/setting.py b/src/faceoff/models/setting.py → faceoff/models/setting.py
diff --git a/src/faceoff/models/user.py → faceoff/models/user.py b/src/faceoff/models/user.py → faceoff/models/user.py
diff --git a/src/faceoff/schema/1.0.sql → faceoff/schema/1.0.sql b/src/faceoff/schema/1.0.sql → faceoff/schema/1.0.sql
diff --git a/src/faceoff/schema/1.1.sql → faceoff/schema/1.1.sql b/src/faceoff/schema/1.1.sql → faceoff/schema/1.1.sql
diff --git a/src/faceoff/schema/1.2.sql → faceoff/schema/1.2.sql b/src/faceoff/schema/1.2.sql → faceoff/schema/1.2.sql
diff --git a/src/faceoff/static/css/bootstrap.css → faceoff/static/css/bootstrap.css b/src/faceoff/static/css/bootstrap.css → faceoff/static/css/bootstrap.css
diff --git a/src/faceoff/static/css/faceoff.css → faceoff/static/css/faceoff.css b/src/faceoff/static/css/faceoff.css → faceoff/static/css/faceoff.css
diff --git a/src/faceoff/static/css/faceoff.league.css → faceoff/static/css/faceoff.league.css b/src/faceoff/static/css/faceoff.league.css → faceoff/static/css/faceoff.league.css
diff --git a/src/faceoff/static/css/faceoff.simple.css → faceoff/static/css/faceoff.simple.css b/src/faceoff/static/css/faceoff.simple.css → faceoff/static/css/faceoff.simple.css
diff --git a/src/faceoff/static/favicon.ico → faceoff/static/favicon.ico b/src/faceoff/static/favicon.ico → faceoff/static/favicon.ico
diff --git a/src/faceoff/static/img/bullet-cccccc.png → faceoff/static/img/bullet-cccccc.png b/src/faceoff/static/img/bullet-cccccc.png → faceoff/static/img/bullet-cccccc.png
diff --git a/...static/img/glyphicons-halflings-white.png → ...static/img/glyphicons-halflings-white.png b/...static/img/glyphicons-halflings-white.png → ...static/img/glyphicons-halflings-white.png
diff --git a/...ceoff/static/img/glyphicons-halflings.png → faceoff/static/img/glyphicons-halflings.png b/...ceoff/static/img/glyphicons-halflings.png → faceoff/static/img/glyphicons-halflings.png
diff --git a/src/faceoff/static/img/heading-bg-line.png → faceoff/static/img/heading-bg-line.png b/src/faceoff/static/img/heading-bg-line.png → faceoff/static/img/heading-bg-line.png
diff --git a/src/faceoff/static/img/heading-buttons.png → faceoff/static/img/heading-buttons.png b/src/faceoff/static/img/heading-buttons.png → faceoff/static/img/heading-buttons.png
diff --git a/src/faceoff/static/img/touch-icon.png → faceoff/static/img/touch-icon.png b/src/faceoff/static/img/touch-icon.png → faceoff/static/img/touch-icon.png
diff --git a/src/faceoff/static/js/bootstrap.js → faceoff/static/js/bootstrap.js b/src/faceoff/static/js/bootstrap.js → faceoff/static/js/bootstrap.js
diff --git a/src/faceoff/static/js/faceoff.js → faceoff/static/js/faceoff.js b/src/faceoff/static/js/faceoff.js → faceoff/static/js/faceoff.js
diff --git a/src/faceoff/static/js/jquery.js → faceoff/static/js/jquery.js b/src/faceoff/static/js/jquery.js → faceoff/static/js/jquery.js
diff --git a/src/faceoff/templates/admin.html → faceoff/templates/admin.html b/src/faceoff/templates/admin.html → faceoff/templates/admin.html
diff --git a/src/faceoff/templates/dashboard.html → faceoff/templates/dashboard.html b/src/faceoff/templates/dashboard.html → faceoff/templates/dashboard.html
diff --git a/src/faceoff/templates/forms/admin.html → faceoff/templates/forms/admin.html b/src/faceoff/templates/forms/admin.html → faceoff/templates/forms/admin.html
diff --git a/src/faceoff/templates/forms/join.html → faceoff/templates/forms/join.html b/src/faceoff/templates/forms/join.html → faceoff/templates/forms/join.html
diff --git a/src/faceoff/templates/forms/login.html → faceoff/templates/forms/login.html b/src/faceoff/templates/forms/login.html → faceoff/templates/forms/login.html
diff --git a/src/faceoff/templates/forms/new_league.html → faceoff/templates/forms/new_league.html b/src/faceoff/templates/forms/new_league.html → faceoff/templates/forms/new_league.html
diff --git a/src/faceoff/templates/forms/profile.html → faceoff/templates/forms/profile.html b/src/faceoff/templates/forms/profile.html → faceoff/templates/forms/profile.html
diff --git a/src/faceoff/templates/forms/rebuild.html → faceoff/templates/forms/rebuild.html b/src/faceoff/templates/forms/rebuild.html → faceoff/templates/forms/rebuild.html
diff --git a/src/faceoff/templates/forms/report.html → faceoff/templates/forms/report.html b/src/faceoff/templates/forms/report.html → faceoff/templates/forms/report.html
diff --git a/src/faceoff/templates/forms/settings.html → faceoff/templates/forms/settings.html b/src/faceoff/templates/forms/settings.html → faceoff/templates/forms/settings.html
diff --git a/src/faceoff/templates/gate.html → faceoff/templates/gate.html b/src/faceoff/templates/gate.html → faceoff/templates/gate.html
diff --git a/src/faceoff/templates/history.html → faceoff/templates/history.html b/src/faceoff/templates/history.html → faceoff/templates/history.html
diff --git a/src/faceoff/templates/inactive.html → faceoff/templates/inactive.html b/src/faceoff/templates/inactive.html → faceoff/templates/inactive.html
diff --git a/src/faceoff/templates/join.html → faceoff/templates/join.html b/src/faceoff/templates/join.html → faceoff/templates/join.html
diff --git a/src/faceoff/templates/landing.html → faceoff/templates/landing.html b/src/faceoff/templates/landing.html → faceoff/templates/landing.html
diff --git a/src/faceoff/templates/layouts/base.html → faceoff/templates/layouts/base.html b/src/faceoff/templates/layouts/base.html → faceoff/templates/layouts/base.html
diff --git a/src/faceoff/templates/layouts/league.html → faceoff/templates/layouts/league.html b/src/faceoff/templates/layouts/league.html → faceoff/templates/layouts/league.html
diff --git a/src/faceoff/templates/layouts/simple.html → faceoff/templates/layouts/simple.html b/src/faceoff/templates/layouts/simple.html → faceoff/templates/layouts/simple.html
diff --git a/src/faceoff/templates/login.html → faceoff/templates/login.html b/src/faceoff/templates/login.html → faceoff/templates/login.html
diff --git a/src/faceoff/templates/macros/form.html → faceoff/templates/macros/form.html b/src/faceoff/templates/macros/form.html → faceoff/templates/macros/form.html
diff --git a/src/faceoff/templates/macros/page.html → faceoff/templates/macros/page.html b/src/faceoff/templates/macros/page.html → faceoff/templates/macros/page.html
diff --git a/src/faceoff/templates/new_league.html → faceoff/templates/new_league.html b/src/faceoff/templates/new_league.html → faceoff/templates/new_league.html
diff --git a/src/faceoff/templates/profile.html → faceoff/templates/profile.html b/src/faceoff/templates/profile.html → faceoff/templates/profile.html
diff --git a/src/faceoff/templates/report.html → faceoff/templates/report.html b/src/faceoff/templates/report.html → faceoff/templates/report.html
diff --git a/src/faceoff/templates/settings.html → faceoff/templates/settings.html b/src/faceoff/templates/settings.html → faceoff/templates/settings.html
diff --git a/src/faceoff/templates/standings.html → faceoff/templates/standings.html b/src/faceoff/templates/standings.html → faceoff/templates/standings.html
diff --git a/src/faceoff/tpl.py → faceoff/tpl.py b/src/faceoff/tpl.py → faceoff/tpl.py
diff --git a/src/faceoff/views.py → faceoff/views.py b/src/faceoff/views.py → faceoff/views.py
diff --git a/lib/natsort.py b/lib/natsort.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 Flask==0.8.1
 WTForms==0.6.3
-trueskill==0.4.1
 flake8==2.1.0
+natsort==3.0.2
+trueskill==0.4.1
diff --git a/bin/ctags.sh → scripts/ctags.sh b/bin/ctags.sh → scripts/ctags.sh
diff --git a/bin/dbstat.sh → scripts/dbstat.sh b/bin/dbstat.sh → scripts/dbstat.sh
diff --git a/bin/run-server.py → scripts/run-server.py b/bin/run-server.py → scripts/run-server.py
@@ -7,12 +7,11 @@
 License: MIT, see LICENSE for details
 """
 
-import sys
-import os
+from sys import path
+from os import environ
+from os.path import dirname, join
 
-project_dir = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
-sys.path.insert(0, os.path.join(project_dir, 'src'))
-sys.path.insert(1, os.path.join(project_dir, 'lib'))
+path.append(join(dirname(__file__), '..'))
 
 from argparse import ArgumentParser
 parser = ArgumentParser(usage='%(prog)s [options]', argument_default='')
@@ -27,7 +26,7 @@
 parser.add_argument('--log-filter', metavar='<string>', dest='FACEOFF_LOG_FILTER')
 parser.add_argument('--log-ignore', metavar='<string>', dest='FACEOFF_LOG_IGNORE')
 args = parser.parse_args()
-os.environ.update(vars(args))
+environ.update(vars(args))
 
 from faceoff import app
 app.run(args.FACEOFF_HOST, int(args.FACEOFF_PORT), threaded=True)