Skip to content

Commit

Permalink
Merge pull request #8 from TwigWorld/SP-130-django-upgrade-2-2
Browse files Browse the repository at this point in the history
Upgrade django version to 2.2
  • Loading branch information
davismr authored Feb 15, 2023
2 parents 0074e46 + d0db1e2 commit afd94c5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
long_description=open('README.md').read(),
python_requires='>=3.7.0',
install_requires=[
"Django>=1.11.29, <2.0",
"Django>=2.2, <3.0",
],
packages=find_packages(),
include_package_data=True
Expand Down
2 changes: 1 addition & 1 deletion urlmapper/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Migration(migrations.Migration):
('object_id', models.PositiveIntegerField(null=True, verbose_name='Object ID', blank=True)),
('view_name', models.CharField(max_length=255, verbose_name='View name', blank=True)),
('view_keywords', models.TextField(help_text='Use a=b to define keywords and commas to separate e.g slug=terms-and-conditions, language=en', verbose_name='View keywords', blank=True)),
('content_type', models.ForeignKey(verbose_name='Content Type', blank=True, to='contenttypes.ContentType', null=True)),
('content_type', models.ForeignKey(on_delete=models.deletion.CASCADE, verbose_name='Content Type', blank=True, to='contenttypes.ContentType', null=True)),
],
options={
'verbose_name': 'URL map',
Expand Down
5 changes: 3 additions & 2 deletions urlmapper/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.contrib.contenttypes.fields import GenericForeignKey
from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse, resolve, NoReverseMatch, Resolver404
from django.urls import reverse, resolve, NoReverseMatch, Resolver404
from django.db import models
from django.utils.translation import ugettext_lazy as _, ugettext
# django/py3
Expand Down Expand Up @@ -70,7 +70,8 @@ class URLMap(models.Model):
verbose_name=_("Content Type"),
limit_choices_to=_get_content_type_choices(),
blank=True,
null=True
null=True,
on_delete=models.CASCADE
)
object_id = models.PositiveIntegerField(
_("Object ID"),
Expand Down

0 comments on commit afd94c5

Please sign in to comment.