django22: declare django2.2 in setup and tox (#51125)

passerelle_montpellier_encombrants/migrations/0002_auto_20150413_0629.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -52,13 +53,13 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='commune',
             name='sector',
-            field=models.ForeignKey(to='passerelle_montpellier_encombrants.Sector'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passerelle_montpellier_encombrants.Sector'),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='collectday',
             name='sector',
-            field=models.ForeignKey(to='passerelle_montpellier_encombrants.Sector'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passerelle_montpellier_encombrants.Sector'),
             preserve_default=True,
         ),
     ]

passerelle_montpellier_encombrants/migrations/0004_auto_20150430_0326.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -24,7 +25,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='collectday',
             name='sector',
-            field=models.ForeignKey(verbose_name='Sector', to='passerelle_montpellier_encombrants.Sector'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, verbose_name='Sector', to='passerelle_montpellier_encombrants.Sector'),
             preserve_default=True,
         ),
         migrations.AlterField(
@@ -42,7 +43,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='commune',
             name='sector',
-            field=models.ForeignKey(verbose_name='Sector', to='passerelle_montpellier_encombrants.Sector'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, verbose_name='Sector', to='passerelle_montpellier_encombrants.Sector'),
             preserve_default=True,
         ),
     ]

passerelle_montpellier_encombrants/migrations/0005_street.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
                     models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
                 ),
                 ('name', models.CharField(max_length=128, verbose_name='Street')),
-                ('commune', models.ForeignKey(to='passerelle_montpellier_encombrants.Commune')),
+                ('commune', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passerelle_montpellier_encombrants.Commune')),
             ],
             options={},
             bases=(models.Model,),

passerelle_montpellier_encombrants/models.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.utils import six
 from django.utils.translation import ugettext_lazy as _
@@ -64,7 +64,7 @@ class Sector(models.Model):
 class Commune(models.Model):
     name = models.CharField(max_length=50, blank=False, verbose_name=_('Name'))
     insee = models.CharField(max_length=10, blank=False, verbose_name=_('INSEE Code'))
-    sector = models.ForeignKey(Sector, verbose_name=_('Sector'))
+    sector = models.ForeignKey(Sector, verbose_name=_('Sector'), on_delete=models.CASCADE)
 
     def __str__(self):
         return u'%s (%s)' % (self.name, self.insee)
@@ -72,7 +72,7 @@ class Commune(models.Model):
 
 @six.python_2_unicode_compatible
 class Street(models.Model):
-    commune = models.ForeignKey(Commune)
+    commune = models.ForeignKey(Commune, on_delete=models.CASCADE)
     name = models.CharField(max_length=128, blank=False, verbose_name=_('Street'))
 
     def __str__(self):
@@ -81,7 +81,7 @@ class Street(models.Model):
 
 @six.python_2_unicode_compatible
 class CollectDay(models.Model):
-    sector = models.ForeignKey(Sector, verbose_name=_('Sector'))
+    sector = models.ForeignKey(Sector, verbose_name=_('Sector'), on_delete=models.CASCADE)
     date = models.DateField(verbose_name=_('Date'))
 
     class Meta:

passerelle_montpellier_encombrants/views.py

@@ -16,7 +16,7 @@
 
 import datetime
 
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.views.generic import DetailView, ListView
 from django.views.generic.base import View
 from django.views.generic.detail import SingleObjectMixin

setup.py

@@ -106,7 +106,7 @@ setup(
         'Programming Language :: Python :: 2',
     ],
     install_requires=[
-        'django>=1.11, <1.12',
+        'django>=1.11, <2.3',
     ],
     zip_safe=False,
     cmdclass={

tests/test_main.py

@@ -7,7 +7,7 @@ from random import randint
 from django.test import TestCase
 from django.test.client import Client
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_text
 
 from passerelle_montpellier_encombrants.models import (

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py3-junit-coverage
+envlist = py3-django111-junit-coverage,py3-django22
 toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle-montpellier-encombrants/{env:BRANCH_NAME:}
 
 [testenv]
@@ -14,6 +14,8 @@ setenv =
   coverage: COVERAGE=--cov-report xml --cov-report html --cov=passerelle_montpellier_encombrants/
   junit: JUNIT=--junitxml=junit-{envname}.xml
 deps =
+  django111: django>=1.11, <1.12
+  django22: django>=2.2, <2.3
   https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz
   psycopg2-binary
   xmlschema<1.1