Skip to content

Commit

Permalink
Merge branch 'feature/organize' into develop
Browse files Browse the repository at this point in the history
pretty happy with how this turned out.
  • Loading branch information
morgajel committed Sep 5, 2014
2 parents c1b3a07 + 84d91ec commit 29d9c77
Show file tree
Hide file tree
Showing 462 changed files with 3,920 additions and 3,457 deletions.
5 changes: 4 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[run]
branch = True

[report]
omit = /usr/*, env/*
omit = /usr/*, env/*, ~/virtualenv/python*/*, ~/virtualenv/pypy*/*, /opt/python/*
38 changes: 6 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,43 +1,17 @@
.coveralls.yml
data/config.ini
# Deprecated Data files
data/*.xml

# compiled python files
*.py[cod]
env/
# C extensions
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
!lib/README.md
lib64
__pycache__
# Secret Config files:
config.py

# Installer logs
pip-log.txt

# Unit test / coverage reports
# generated files
.coverage
.tox
nosetests.xml

# Translations
*.mo

# Mr Developer
.mr.developer.cfg
.project
.pydevproject
#vim temp files
*.swp
static/coverage/
20 changes: 18 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
language: python
services:
- redis-server
python:
- "2.7"
- "pypy"
install:
- pip install -r requirements.txt
# command to run tests
script: nosetests
before_script:
- cp config.py.example config.py
- python reimport_data.py
script: nosetests
after_success:
coveralls
notifications:
irc:
channels: "chat.freenode.net#kakow"
on_success: change # default: always
on_failure: change # default: always
use_notice: true
skip_join: true
template:
- "%{repository} (%{commit}) : %{message} "
- "Build details: %{build_url}"
1 change: 1 addition & 0 deletions .vimrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
" Indent Python in the Google way.

execute pathogen#infect()
setlocal indentexpr=GetGooglePythonIndent(v:lnum)

let s:maxoff = 50 " maximum number of lines to look backwards.
Expand Down
24 changes: 24 additions & 0 deletions config.py.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
class BaseConfiguration(object):
# Statement for enabling the development environment
DEBUG = True

LOG_PATH='data/logging.json'

REDIS_URL='redis://127.0.0.1:6379/'

class ProductionConfiguration(BaseConfiguration):
# Statement for enabling the development environment
DEBUG = False

LOG_PATH='data/logging.json'

REDIS_URL='redis://127.0.0.1:6379/'

class TestConfiguration(BaseConfiguration):
# Statement for enabling the development environment
DEBUG = False

LOG_PATH='data/logging.json'

REDIS_URL='redis://127.0.0.1:6379/'

6 changes: 0 additions & 6 deletions data/config.ini.example

This file was deleted.

22 changes: 0 additions & 22 deletions generators/Artwork.py

This file was deleted.

49 changes: 0 additions & 49 deletions generators/Bond.py

This file was deleted.

52 changes: 0 additions & 52 deletions generators/Business.py

This file was deleted.

23 changes: 0 additions & 23 deletions generators/Continent.py

This file was deleted.

23 changes: 0 additions & 23 deletions generators/Country.py

This file was deleted.

27 changes: 0 additions & 27 deletions generators/Cuisine.py

This file was deleted.

27 changes: 0 additions & 27 deletions generators/Currency.py

This file was deleted.

19 changes: 0 additions & 19 deletions generators/Event.py

This file was deleted.

0 comments on commit 29d9c77

Please sign in to comment.