Permalink
Browse files

Merge branch 'release/0.2'

* release/0.2:
  Version bump! Preparing for 0.2 release.
  Adding our initial south migrations for 'django_twilio'.
  Installing 'south'.
  Adding 'south' to requirements.
  Revert "Attempting to remove ``Sphinx`` from our requirements."
  Fixing our import path so our docs can build.
  Updating our MANIFEST to include our new README.md.
  Fixing broken README link.
  Attempting to remove ``Sphinx`` from our requirements.
  Whoops.
  Making our documentation a nice link :)
  Making our meta section a markdown list.
  Porting our README to markdown.
  • Loading branch information...
2 parents de0b001 + 882a27f commit c4d5f4040309a1e78af80ea63d75a4c151c62d45 @randalldegges-okta-2 randalldegges-okta-2 committed Apr 8, 2012
View
@@ -1,4 +1,4 @@
-include AUTHORS README requirements.txt UNLICENSE
+include AUTHORS README.md requirements.txt UNLICENSE
recursive-include docs *
recursive-include test_project *
recursive-exclude docs/source *.pyc
View
34 README
@@ -1,34 +0,0 @@
- _ _ _ _ _ _
- __| |(_) __ _ _ __ __ _ ___ | |___ _(_) (_) ___
- / _` || |/ _` | '_ \ / _` |/ _ \ _____| __\ \ /\ / / | | |/ _ \
-| (_| || | (_| | | | | (_| | (_) |_____| |_ \ V V /| | | | (_) |
- \__,_|/ |\__,_|_| |_|\__, |\___/ \__| \_/\_/ |_|_|_|\___/
- |__/ |___/
-
-A simple library for building Twilio-powered Django webapps.
-
-
-Meta
-====
-
-author: Randall Degges
-email: rdegges@gmail.com
-status: maintained, stable
-
-
-Purpose
-=======
-
-Building telephony applications with Twilio is easy, but not simple.
-
-django-twilio is my attempt at reducing some of the complexities of telephony
-development with Twilio--namely, implementing common patterns, helpers, etc., so
-that you can truly focus on the core application logic and leave out all the
-rest.
-
-
-Docs
-====
-
-The documentation is hosted at ReadTheDocs. You can check out the docs here:
-http://django-twilio.rtfd.org/
View
@@ -0,0 +1,24 @@
+A simple library for building Twilio-powered Django webapps.
+
+
+## Meta
+
+* author: Randall Degges
+* email: rdegges@gmail.com
+* status: maintained, stable
+
+
+## Purpose
+
+Building telephony applications with Twilio is easy, but not simple.
+
+django-twilio is my attempt at reducing some of the complexities of telephony
+development with Twilio--namely, implementing common patterns, helpers, etc., so
+that you can truly focus on the core application logic and leave out all the
+rest.
+
+
+## Documentation
+
+The documentation is hosted at ReadTheDocs. You can check out the docs
+[here](http://django-twilio.rtfd.org/ "django-twilio latest").
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding model 'Caller'
+ db.create_table('django_twilio_caller', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('blacklisted', self.gf('django.db.models.fields.BooleanField')(default=False)),
+ ('phone_number', self.gf('django.db.models.fields.CharField')(unique=True, max_length=20)),
+ ))
+ db.send_create_signal('django_twilio', ['Caller'])
+
+ def backwards(self, orm):
+ # Deleting model 'Caller'
+ db.delete_table('django_twilio_caller')
+
+ models = {
+ 'django_twilio.caller': {
+ 'Meta': {'object_name': 'Caller'},
+ 'blacklisted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'phone_number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
+ }
+ }
+
+ complete_apps = ['django_twilio']
No changes.
View
@@ -19,7 +19,7 @@
sys.path.insert(0, os.path.abspath('../../django_twilio'))
sys.path.insert(1, os.path.abspath('../../test_project'))
-import settings
+from test_project import settings
from django.core.management import setup_environ
setup_environ(settings)
View
@@ -1,3 +1,4 @@
coverage==3.5.1
django-nose==1.0
+South==0.7.4
Sphinx==1.1.2
View
@@ -7,7 +7,7 @@
# Basic package information:
name = 'django-twilio',
- version = '0.1',
+ version = '0.2',
packages = find_packages(),
# Packaging options:
@@ -24,6 +24,7 @@
url = 'http://twilio.com/',
keywords = 'twilio telephony call phone voip sms',
description = 'A simple library for building twilio-powered Django webapps.',
- long_description = open(normpath(join(dirname(abspath(__file__)), 'README'))).read()
+ long_description = open(normpath(join(dirname(abspath(__file__)),
+ 'README.md'))).read()
)
View
@@ -118,6 +118,9 @@
'django.contrib.admin',
'django.contrib.admindocs',
+ # Use south for database migrations:
+ 'south',
+
# Use django-nose for running our tests:
'django_nose',

0 comments on commit c4d5f40

Please sign in to comment.