diff options
| author | Stephan Groß | 2013-03-04 14:04:03 +0100 | 
|---|---|---|
| committer | Stephan Groß | 2013-03-04 14:04:03 +0100 | 
| commit | d6391359f5cf4be394cf5785edab882f28cb225a (patch) | |
| tree | 7eaa9876b96436a77feaf490382271d16133d643 | |
| parent | 4cdb6b2959f6d13417c48781d53c4e7e685934e7 (diff) | |
| download | django-rest-framework-d6391359f5cf4be394cf5785edab882f28cb225a.tar.bz2 | |
Fix fix migrate authtoken
| -rw-r--r-- | docs/api-guide/settings.md | 12 | ||||
| -rw-r--r-- | rest_framework/authtoken/migrations/0001_initial.py | 2 | ||||
| -rw-r--r-- | rest_framework/settings.py | 3 | 
3 files changed, 0 insertions, 17 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 0ecb1d2d..e103fbab 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -174,16 +174,4 @@ The name of a parameter in the URL conf that may be used to provide a format suf  Default: `'format'` -## REQUIRED_MIGRATIONS - -This is a list of required migrations which are needed by the authtoken migration. - -E.g. - -    ( -        ('users', '0001_initial'), -    ) - -Default: `'()'` -  [cite]: http://www.python.org/dev/peps/pep-0020/ diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py index b0c81bf1..b7c563af 100644 --- a/rest_framework/authtoken/migrations/0001_initial.py +++ b/rest_framework/authtoken/migrations/0001_initial.py @@ -17,8 +17,6 @@ else:  class Migration(SchemaMigration): -    depends_on = api_settings.REQUIRED_MIGRATIONS -      def forwards(self, orm):          # Adding model 'Token'          db.create_table('authtoken_token', ( diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 31912215..b7aa0bbe 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -76,9 +76,6 @@ DEFAULTS = {      'URL_FORMAT_OVERRIDE': 'format',      'FORMAT_SUFFIX_KWARG': 'format', - -    # Authtoken -    'REQUIRED_MIGRATIONS': (),  }  | 
