Added Duckling widget to Homepage

.gitignore

@@ -1,4 +1,7 @@
-_build
 *.pyc
+*.swp
+_build
 dev.db
 site_media
+local.py
+.project

.travis.yml

@@ -0,0 +1,12 @@
+# If you change the DB name here, also change it in pyohio/settings/travis.py
+before_script:
+  - psql -c 'create database pyohio2014;' -U postgres
+language: python
+python:
+  - "2.7"
+env:
+  - TOXENV=pyohio
+install:
+  - pip install -q tox==1.6.1
+script:
+  - tox -- --settings=pyohio.settings.travis

README.rst

@@ -0,0 +1,66 @@
+The PyOhio 2014 website being built by Caktus Consulting Group, based on Pinax
+Symposion.
+
+Rather than use this as the basis for your conference site directly, you should
+instead look at https://github.com/pinax/symposion which was designed for reuse.
+
+PyOhio 2014
+============
+
+PyOhio 2014 is built on top of Pinax Symposion but may have customizations that
+will may make things more difficult for you.
+
+To get running locally
+----------------------
+
+This documentation assume you have the following installed::
+
+- `pip >= 1.2.1 <http://www.pip-installer.org/>`_
+- `virtualenv >= 1.11 <http://www.virtualenv.org/>`_
+- `virtualenvwrapper >= 3.6 <http://pypi.python.org/pypi/virtualenvwrapper>`_
+
+Create a new virtualenv and install the necessary requirements::
+
+    mkvirtualenv --distribute pyohio --python=python2.7
+    $VIRTUAL_ENV/bin/pip install -r $PWD/requirements/dev.txt
+
+(For production, install -r requirements/base.txt).
+
+Then create a local settings file and set your ``DJANGO_SETTINGS_MODULE`` to use it::
+
+    cp pyohio/settings/local.py.example pyohio/settings/local.py
+    echo "export DJANGO_SETTINGS_MODULE=pyohio.settings.local" >> $VIRTUAL_ENV/bin/postactivate
+    echo "unset DJANGO_SETTINGS_MODULE" >> $VIRTUAL_ENV/bin/postdeactivate
+
+Exit the virtualenv and reactivate it to activate the settings just changed::
+
+    deactivate
+    workon pyohio
+
+Setup the postgres database and load fixtures::
+
+    createdb pyohio2014
+    python manage.py syncdb
+    python manage.py migrate
+    python manage.py loaddata fixtures/*
+
+Create a user account::
+
+    python manage.py createsuperuser
+
+
+Run local server::
+
+    python manage.py runserver
+
+For Gondor
+--------------
+
+* TODO
+
+To run tests
+------------
+
+::
+
+    python manage.py test pyhio

gondor.yml

@@ -1,20 +1,21 @@
 # The key associated to your site.
-key: FY0S42YC6U6
+key: Y3D4C8S0C2I
 
 # Version control system used locally for your project.
 vcs: git
 
 # Python version to run on Gondor.
-# runtime: python-2.7.3
+runtime: python-2.7.3
 
 # This path is relative to your project root (the directory gondor.yml lives in.)
-requirements_file: requirements.txt
+requirements_file: requirements/base.txt
 
 # Commands to be executed during deployment. These can handle migrations or
 # moving static files into place. Accepts same parameters as gondor run.
 on_deploy:
-    - manage.py syncdb --noinput
-    - manage.py collectstatic --noinput
+     - manage.py syncdb --noinput
+     - manage.py migrate
+     - manage.py collectstatic --noinput
 
 # URLs which should be served by Gondor mapping to a filesystem location
 # relative to your writable storage area.
@@ -30,14 +31,18 @@ wsgi:
     #
     # wsgi = the Python module which should be importable
     # application = the callable in the Python module
-    use_environment_cache: true
     entry_point: pyohio.wsgi:application
-    
+
     # Options for gunicorn which runs your WSGI project.
     gunicorn:
         # The worker class used to run gunicorn (possible values include:
         # sync, eventlet and gevent)
         worker_class: sync
 
+    # Determines whether to use virtual environment caching to speed up
+    # deployments (will only install new dependencies; use gondor deploy
+    # --fresh to deploy to rebuild the virtual environment)
+    use_environment_cache: true
+
 env:
-    DJANGO_SETTINGS_MODULE: pyohio.settings_gondor
+    DJANGO_SETTINGS_MODULE: pyohio.settings.gondor

manage.py

@@ -1,9 +1,17 @@
 #!/usr/bin/env python
-import os, sys
+import os
+import sys
+
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pyohio.settings")
-
+    settings = 'local'
+
+    if 'test' in sys.argv:
+        # Running tests - use test-specific settings
+        settings = "test"
+
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pyohio.settings.%s" % settings)
+
     from django.core.management import execute_from_command_line
-    
+
     execute_from_command_line(sys.argv)

pyohio/proposals/admin.py

@@ -1,8 +1,8 @@
 from django.contrib import admin
 
-from pyohio.proposals.models import TalkProposal, TutorialProposal, OpenSpaceProposal
+from .models import OpenSpaceProposal, TalkProposal, TutorialProposal
 
 
+admin.site.register(OpenSpaceProposal)
 admin.site.register(TalkProposal)
 admin.site.register(TutorialProposal)
-admin.site.register(OpenSpaceProposal)

pyohio/proposals/forms.py

@@ -2,12 +2,11 @@
 
 from markitup.widgets import MarkItUpWidget
 
-from pyohio.proposals.models import TalkProposal, TutorialProposal
-from pyohio.proposals.models import OpenSpaceProposal
+from .models import OpenSpaceProposal, TalkProposal, TutorialProposal
 
 
 class ProposalForm(forms.ModelForm):
-    
+
     def clean_description(self):
         value = self.cleaned_data["description"]
         if len(value) > 400: