Skip to content
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

Towards Django 2.0 support #395

Merged
merged 8 commits into from
Dec 28, 2017
Merged

Towards Django 2.0 support #395

merged 8 commits into from
Dec 28, 2017

Conversation

stefanor
Copy link
Member

@stefanor stefanor commented Dec 28, 2017

Mostly adding on_delete to migrations. Also, follow through on some other deprecations.

This seems to work, at least for basic functionality, haven't tried building a schedule.

drf-extensions doesn't support Django 2.0 yet, I tested with local hacks to it. I see the same things in master, so guess it should at least be importable in the next release (although possibly not working correctly, yet).
django-markitup doesn't support Django 2.0 yet, but I did some work on that, upstream: zsiciarz/django-markitup#21.

Copy link
Member

@drnlm drnlm left a comment

Choose a reason for hiding this comment

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

1 minor style comment, but the changes look sensible.

@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
('status', models.CharField(default=b'P', max_length=1, choices=[(b'A', b'Accepted'), (b'R', b'Not Accepted'), (b'P', b'Under Consideration')])),
('_abstract_rendered', models.TextField(editable=False, blank=True)),
('authors', models.ManyToManyField(related_name='talks', to=settings.AUTH_USER_MODEL)),
('corresponding_author', models.ForeignKey(related_name='contact_talks', to=settings.AUTH_USER_MODEL)),
('corresponding_author', models.ForeignKey(related_name='contact_talks', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
Copy link
Member

Choose a reason for hiding this comment

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

Any specific reason to not reformat this long line like the other changes?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think I meant to come back to that. The whole area is a lot messier.

Copy link
Member

@drnlm drnlm left a comment

Choose a reason for hiding this comment

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

👍

@stefanor stefanor merged commit ef610f9 into master Dec 28, 2017
@stefanor stefanor deleted the on-delete branch December 28, 2017 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants