Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 18, 2014

Conversation

carltongibson
Copy link
Collaborator

For #1559 take 2. Replaces #1653.

(The branch name was obviously causing GitHub some confusion...)

Merges against 2.4.0 branch (since it's a small breaking change).

Carlton Gibson added 3 commits June 23, 2014 14:52
@yuvadm
Copy link

yuvadm commented Jun 24, 2014

Thanks for the work on this, looking forward for the merge and a subsequent release.

1.7 RC is coming up in the next few days and many projects have started migrating.

@xordoquy
Copy link
Collaborator

I doubt many projects have migrated. There are many libraries that are not compatible with the new app refactoring yet. Been bitten a lot with this.

@xordoquy
Copy link
Collaborator

xordoquy commented Jul 1, 2014

This looks good to me.

@carltongibson
Copy link
Collaborator Author

I still need to alter the docs re migration dependencies. See comment

I'm hoping it's just the name change but the Django docs example uses "migration" — or similar — as the key which confused me, so I wanted to take a moment to make sure I'm on top of it.

If the pull is okay other than that I'll get it done.


---

**Note:** Make sure to run `manage.py syncdb` after changing your settings. Both Django native (from v1.7) and South migrations for the `authtoken` database tables are provided. See [Schema migrations](#schema-migrations) below.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would probably re-word this and similar paragraphs, to change the emphasis. Eg, Migrations for the authtoken database tables are provided, and include both Django 1.7 and South migration files.

@tomchristie
Copy link
Member

Looks like we could recommend South 1.0 instead of any settings changes... http://www.aeracode.org/2014/7/1/end-era/

@xordoquy
Copy link
Collaborator

xordoquy commented Jul 1, 2014

Agreed.

@carltongibson
Copy link
Collaborator Author

south_migrations

Pleased with my psychic powers there.

@tomchristie
Copy link
Member

Pleased with my psychic powers there.

Well played. 👏

@yuvadm
Copy link

yuvadm commented Jul 17, 2014

I have a Django 1.7c1 project that's pending the authtoken migrations, and I really don't want to (privately) fork just for this.

Is there anything I can do to help speed up this PR?

@carltongibson
Copy link
Collaborator Author

Is there anything I can do to help speed up this PR?

Argh! I just need to write the docs here and I think it's good to go — but it's targeting 2.4 — When's that due to go?

(I can make the time if it's imminent. As ever just been otherwise engaged.)

@tomchristie
Copy link
Member

@carltongibson I may have some time to review the 2.4 status in a week or two. Main thing is for us to review/check what's actually changed, given it's been outstanding for so long.

@carltongibson
Copy link
Collaborator Author

OK — I'll take on the docs before then.

@carltongibson carltongibson added this to the 2.4 Release milestone Aug 18, 2014
@carltongibson
Copy link
Collaborator Author

OK — docs updated.

@xordoquy
Copy link
Collaborator

@carltongibson thanks for dealing with this

@carltongibson
Copy link
Collaborator Author

@xordoquy — it's a pleasure :) — it's been a bit like pulling teeth finding time recently...

@tomchristie
Copy link
Member

Presumably this is good to merge into 2.4 now then?

@carltongibson
Copy link
Collaborator Author

Presumably this is good to merge into 2.4 now then?

I think so. New migration added. Old migration moved. Note to upgrade to South 1.0 (if needed) added to docs and release notes. Anything else?

@xordoquy
Copy link
Collaborator

Feeling like it's ready to merge !

tomchristie added a commit that referenced this pull request Aug 18, 2014
Allow use of native migrations in 1.7 — Take 2
@tomchristie tomchristie merged commit 2aad8e4 into encode:2.4.0 Aug 18, 2014
@tomchristie
Copy link
Member

Rockin' - nice work!

@carltongibson carltongibson deleted the 1559-take-2 branch August 29, 2014 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants