Allow use of native migrations in 1.7 #1653

carltongibson · 2014-06-23T13:07:51Z

First pass at #1559.

South provides a SOUTH_MIGRATION_MODULES setting. We use this to move the existing migrations to one side.

1.7's makemigrations is responsible for the new migration.

Adding the South setting to rest_framework.setttings doesn't work — and (of course) there's no reason that it should.

But manually adding it to your own settings.py does work. The following works:

mkvirtualenv drf-1.6
pip install -r requirements.txt 
pip install South
django-admin.py startproject playgound
cd playground
ln -s ../rest_framework/ rest_framework 
# Add rest_framework, rest_framework.authtoken, south to settings.
# Add SOUTH_MIGRATION_MODULES setting
./manage.py syncdb
./manage.py migrate --list # Just the unapplied authtoken migration
./manage.py migrate --all

I need to back out the change to rest_framework.setttings and document (where?) the change and (at first glance) it looks good.

Thoughts?

…erent route types

…een different route types

…ute, marked the originals as deprecated.

Closes encode#1028

Fixed code example.

Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py

Conflicts: tests/test_serializer.py

Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini

Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini

carltongibson · 2014-06-23T13:10:04Z

rest_framework/settings.py

+
+    # 1.7 Migration Compatibility
+
+    'SOUTH_MIGRATION_MODULES': {


This doesn't work here. Needs to be in actual settings. That needs to be added to the docs.

xordoquy · 2014-06-23T13:22:51Z

@carltongibson thanks for the PR and the tests.
As for the documentation, there should be mention about this in the authtoken section (http://www.django-rest-framework.org/api-guide/authentication#tokenauthentication) and a huge warning in the release notes.

carltongibson · 2014-06-23T13:27:53Z

OK — I'll draft the changes there. (Do we have Work In Progress release notes anywhere?)

xordoquy · 2014-06-23T13:33:28Z

Release notes are part of the repository (docs/topics/release-notes.md). We'll add items above the 2.3.14 release.

carltongibson · 2014-06-23T13:34:10Z

Fine. I'll put the notes there. Thanks

…IGRATION_MODULES` setting from `rest_framework.settings`

carltongibson · 2014-06-24T07:04:14Z

docs/api-guide/authentication.md

+This tells South to look in the `south_migrations` module for the `authtoken` app.
+
+----
+

 If you're using a [custom user model][custom-user-model] you'll need to make sure that any initial migration that creates the user table runs before the authtoken table is created.


Without thinking about it, I'm not sure what needs to be said in this section.

Topics are:

Migration dependencies. (Not sure, yet, how Django handles that)

post_save creation of tokens — I'd guess this remains unchanged but need to think it through.

Grumble, grumble... :) Django uses depenencies rather than needed_by but looks okay other than that.

https://docs.djangoproject.com/en/1.7/topics/migrations/#migration-files

I'll edit later on

I don't think this will change anything for those two points. We are just using an alternative location for south's modules.
However I don't know the minimum south version that will support that configuration option.

…into encode#1559 Conflicts: docs/topics/release-notes.md

carltongibson · 2014-06-24T08:45:39Z

@xordoquy — OK, I've done something wrong...

I merged the 2.4.0 branch into my #1559 — https://github.com/carltongibson/django-rest-framework/tree/%231559 — but when I go to compare against 2.4.0 GitHub "can't find anything to compare".

As far as I can see my branch is a straight 3 commits ahead of 2.4.0 so I'm not sure what I've done. Could you review?

Thanks!

xordoquy · 2014-06-24T08:50:12Z

@carltongibson will do that after meal.

carltongibson · 2014-06-24T08:51:20Z

Cool. Thanks.

On 24 Jun 2014, at 10:50, Xavier Ordoquy notifications@github.com wrote:

@carltongibson will do that after meal.

—
Reply to this email directly or view it on GitHub.

carltongibson · 2014-06-24T11:17:07Z

@xordoquy — I tried with a different branch name — and now it works — see #1654

tomchristie and others added 30 commits June 27, 2013 20:29

Remove deprecated code

3fcc012

pending deprecations -> deprecated

379ad8a

Merge branch 'master' into 2.4.0

9e4e2c6

Add support for collection routes to SimpleRouter

d72603b

Add docs for collection routes

5b11e23

Rework extra routes doc for better readability

57cf8b5

Revert route name change and add key to Route object to identify diff…

8d521c0

…erent route types

Rename router collection test case

f022743

Changed collection_* decorators to list_*

e14cbaf

Introduce DynamicDetailRoute and DynamicListRoute to distinguish betw…

ca7ba07

…een different route types

Combined link_* and action_* decorators into detail_route and list_ro…

eaae8fb

…ute, marked the originals as deprecated.

Merge

c607414

Docs tweaking

4292cc1

Merge branch 'master' into 2.4.0

28e44ef

Commenting link/action decorators as pending deprecation

8acee2e

Merge branch 'static-routes' into 0.4.0

db25aaf

If page size query param <= 0, just use default page size.

815ef50

Closes encode#1028

Updating 2.4.0 release notes

44ceef8

Merge master

16ffded

Tweak comment

f631f55

Better docs for customizing dynamic routes. Refs encode#908

bf07b8e

Merge master

9a5b2ee

Merge master

21cd638

Drop 1.3 support

e441f85

Whitespace fix

1bd8fe4

Fixed code example.

ab4be47

Merge pull request encode#1148 from thedrow/patch-1

3604616

Fixed code example.

Add tests to pass for get_ident method in BaseThrottle class.

9ab0759

Add get_ident method to pass new tests.

89f26c5

Add documentation to explain what effect these changes have.

100a933

xordoquy and others added 13 commits April 17, 2014 14:30

Fixed the issue with django-filters / django 1.7 / pytest

c5f68fb

Merge remote-tracking branch 'origin/master' into 2.4.0

56b4390

Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py

Merge remote-tracking branch 'reference/master' into feature/pytest

2aca69a

Conflicts: tests/test_serializer.py

Use url functions from Django itself.

cd93cd1

Added missing field for the tests.

7475fce

Fixed new default for many

38362bb

Fixed new default for many

c9e6f31

Merge remote-tracking branch 'reference/2.4.0' into feature/pytest

7b4463f

Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini

Added missing staticfiles app

eb89ed0

Use urls functions from django instead of compat.

e5441d8

Updated the release-notes.

15c2c58

Merge remote-tracking branch 'origin/master' into 2.4.0

2489e38

Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini

Allow use of native migrations in 1.7

f34011f

carltongibson reviewed Jun 23, 2014
View reviewed changes

xordoquy mentioned this pull request Jun 23, 2014

Getting ready for Django 1.7 #1559

Closed

Added (first pass) notes to docs & release notes. Backed out `SOUTH_M…

3f727ce

…IGRATION_MODULES` setting from `rest_framework.settings`

carltongibson reviewed Jun 24, 2014
View reviewed changes

Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework …

d98245a

…into encode#1559 Conflicts: docs/topics/release-notes.md

carltongibson closed this Jun 24, 2014

carltongibson mentioned this pull request Jun 24, 2014

Allow use of native migrations in 1.7 — Take 2 #1654

Merged

carltongibson deleted the #1559 branch June 24, 2014 11:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Allow use of native migrations in 1.7 #1653

Allow use of native migrations in 1.7 #1653

Uh oh!

carltongibson commented Jun 23, 2014

Uh oh!

carltongibson Jun 23, 2014

Uh oh!

xordoquy commented Jun 23, 2014

Uh oh!

carltongibson commented Jun 23, 2014

Uh oh!

xordoquy commented Jun 23, 2014

Uh oh!

carltongibson commented Jun 23, 2014

Uh oh!

carltongibson Jun 24, 2014

Uh oh!

carltongibson Jun 24, 2014

Uh oh!

xordoquy Jun 24, 2014

Uh oh!

carltongibson commented Jun 24, 2014

Uh oh!

xordoquy commented Jun 24, 2014

Uh oh!

carltongibson commented Jun 24, 2014

Uh oh!

carltongibson commented Jun 24, 2014

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Uh oh!

Allow use of native migrations in 1.7 #1653

Allow use of native migrations in 1.7 #1653

Uh oh!

Conversation

carltongibson commented Jun 23, 2014

Uh oh!

carltongibson Jun 23, 2014

Choose a reason for hiding this comment

Uh oh!

xordoquy commented Jun 23, 2014

Uh oh!

carltongibson commented Jun 23, 2014

Uh oh!

xordoquy commented Jun 23, 2014

Uh oh!

carltongibson commented Jun 23, 2014

Uh oh!

carltongibson Jun 24, 2014

Choose a reason for hiding this comment

Uh oh!

carltongibson Jun 24, 2014

Choose a reason for hiding this comment

Uh oh!

xordoquy Jun 24, 2014

Choose a reason for hiding this comment

Uh oh!

carltongibson commented Jun 24, 2014

Uh oh!

xordoquy commented Jun 24, 2014

Uh oh!

carltongibson commented Jun 24, 2014

Uh oh!

carltongibson commented Jun 24, 2014

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.