Merge branch 'bug/migration_problem_issue_236_master' into 'master'

Bug/migration problem issue 236 master

See merge request NCER-PD/scheduling-system!160

requirements.txt

-Django==1.10.7
+Django==1.11.5
 gunicorn==19.6.0
 Pillow==3.4.2
 psycopg2==2.6.2

smash/web/migrations/0066_subject.py

@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.db.models.deletion
-
+from django import VERSION as DJANGO_VERSION
 
 class Migration(migrations.Migration):
 
@@ -12,21 +12,41 @@ class Migration(migrations.Migration):
         ('web', '0065_auto_20171127_0957'),
     ]
 
-    operations = [
-        migrations.RunSQL('alter sequence web_subject_id_seq rename to web_studysubject_id_seq;'),
-        migrations.RunSQL('alter sequence web_subject_languages_id_seq rename to web_studysubject_languages_id_seq;'),
-        migrations.RunSQL('alter table web_studysubject rename constraint web_subject_flying_team_id_ef78de5d_fk_web_flyingteam_id to web_studysubject_flying_team_id_ef78de5d_fk_web_flyingteam_id;'),
-        migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_language_id_80eca4c1_fk_web_language_id to web_studysubject_languages_language_id_80eca4c1_fk_web_language_id;'),
-        migrations.RunSQL('alter table web_studysubject rename constraint web_subject_country_id_5d976875_fk_web_country_id to web_studysubject_country_id_5d976875_fk_web_country_id;'),
-        migrations.RunSQL('alter table web_studysubject rename constraint web_subject_default_location_id_da83b714_fk_web_location_id to web_studyubject_default_location_id_da83b714_fk_web_location_id;'),
-        migrations.RunSQL('alter table web_studysubject rename constraint web_subject_pkey to web_studysubject_pkey;'),
-        migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_pkey to web_studysubject_languages_pkey;'),
-        migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_subject_id_a5eb4f49_uniq to web_studysubject_languages_subject_id_a5eb4f49_uniq;'),
-        migrations.RunSQL('alter index if exists web_subject_15d1b6cd rename to web_studysubject_15d1b6cd;'),
-        migrations.RunSQL('alter index if exists web_subject_496f9482 rename to web_studysubject_496f9482;'),
-        migrations.RunSQL('alter index if exists web_subject_84b500ff rename to web_studysubject_84b500ff;'),
-        migrations.RunSQL('alter index if exists web_subject_9571fdf9 rename to web_studysubject_9571fdf9;'),
-        migrations.RunSQL('alter index if exists web_subject_languages_468679bd rename to web_studysubject_languages_468679bd;'),
-        migrations.RunSQL('alter index if exists web_subject_languages_ffaba1d1 rename to web_studysubject_languages_ffaba1d1;'),
-        migrations.RunSQL('alter index if exists web_subject_screening_number_75aa70c7_like rename to web_studysubject_screening_number_75aa70c7_like;')
-    ]
+    if DJANGO_VERSION[:2] < (1, 11):
+        operations = [
+            migrations.RunSQL('alter sequence web_subject_id_seq rename to web_studysubject_id_seq;'),
+            migrations.RunSQL('alter sequence web_subject_languages_id_seq rename to web_studysubject_languages_id_seq;'),
+            migrations.RunSQL('alter table web_studysubject rename constraint web_subject_flying_team_id_ef78de5d_fk_web_flyingteam_id to web_studysubject_flying_team_id_ef78de5d_fk_web_flyingteam_id;'),
+            migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_language_id_80eca4c1_fk_web_language_id to web_studysubject_languages_language_id_80eca4c1_fk_web_language_id;'),
+            migrations.RunSQL('alter table web_studysubject rename constraint web_subject_country_id_5d976875_fk_web_country_id to web_studysubject_country_id_5d976875_fk_web_country_id;'),
+            migrations.RunSQL('alter table web_studysubject rename constraint web_subject_default_location_id_da83b714_fk_web_location_id to web_studyubject_default_location_id_da83b714_fk_web_location_id;'),
+            migrations.RunSQL('alter table web_studysubject rename constraint web_subject_pkey to web_studysubject_pkey;'),
+            migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_pkey to web_studysubject_languages_pkey;'),
+            migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_subject_id_a5eb4f49_uniq to web_studysubject_languages_subject_id_a5eb4f49_uniq;'),
+            migrations.RunSQL('alter index if exists web_subject_15d1b6cd rename to web_studysubject_15d1b6cd;'),
+            migrations.RunSQL('alter index if exists web_subject_496f9482 rename to web_studysubject_496f9482;'),
+            migrations.RunSQL('alter index if exists web_subject_84b500ff rename to web_studysubject_84b500ff;'),
+            migrations.RunSQL('alter index if exists web_subject_9571fdf9 rename to web_studysubject_9571fdf9;'),
+            migrations.RunSQL('alter index if exists web_subject_languages_468679bd rename to web_studysubject_languages_468679bd;'),
+            migrations.RunSQL('alter index if exists web_subject_languages_ffaba1d1 rename to web_studysubject_languages_ffaba1d1;'),
+            migrations.RunSQL('alter index if exists web_subject_screening_number_75aa70c7_like rename to web_studysubject_screening_number_75aa70c7_like;')
+        ]
+    else:
+        operations = [
+            migrations.RunSQL('alter sequence web_subject_id_seq rename to web_studysubject_id_seq;'),
+            migrations.RunSQL('alter sequence web_subject_languages_id_seq rename to web_studysubject_languages_id_seq;'),
+            migrations.RunSQL('alter table web_studysubject rename constraint web_subject_flying_team_id_ef78de5d_fk_web_flyingteam_id to web_studysubject_flying_team_id_ef78de5d_fk_web_flyingteam_id;'),
+            migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_language_id_80eca4c1_fk_web_language_id to web_studysubject_languages_language_id_80eca4c1_fk_web_language_id;'),
+            migrations.RunSQL('alter table web_studysubject rename constraint web_subject_country_id_5d976875_fk_web_country_id to web_studysubject_country_id_5d976875_fk_web_country_id;'),
+            migrations.RunSQL('alter table web_studysubject rename constraint web_subject_default_location_id_da83b714_fk_web_location_id to web_studyubject_default_location_id_da83b714_fk_web_location_id;'),
+            migrations.RunSQL('alter table web_studysubject rename constraint web_subject_pkey to web_studysubject_pkey;'),
+            migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_pkey to web_studysubject_languages_pkey;'),
+            migrations.RunSQL('alter table web_studysubject_languages rename constraint web_subject_languages_subject_id_language_id_a5eb4f49_uniq to web_studysubject_languages_subject_id_language_id_a5eb4f49_uniq;'),
+            migrations.RunSQL('alter index if exists web_subject_15d1b6cd rename to web_studysubject_15d1b6cd;'),
+            migrations.RunSQL('alter index if exists web_subject_496f9482 rename to web_studysubject_496f9482;'),
+            migrations.RunSQL('alter index if exists web_subject_84b500ff rename to web_studysubject_84b500ff;'),
+            migrations.RunSQL('alter index if exists web_subject_9571fdf9 rename to web_studysubject_9571fdf9;'),
+            migrations.RunSQL('alter index if exists web_subject_languages_468679bd rename to web_studysubject_languages_468679bd;'),
+            migrations.RunSQL('alter index if exists web_subject_languages_ffaba1d1 rename to web_studysubject_languages_ffaba1d1;'),
+            migrations.RunSQL('alter index if exists web_subject_screening_number_75aa70c7_like rename to web_studysubject_screening_number_75aa70c7_like;')
+        ]

smash/web/migrations/0067_subject.py

@@ -12,6 +12,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.RunSQL('alter index if exists web_subject_default_written_communication_language_id_0bce1d22 rename to web_studysubject_default_written_communication_language_id_0bce1d22;'),
+        migrations.RunSQL('alter index if exists web_subject_languages_subject_id_2cf93044 rename to web_studysubject_languages_subject_id_2cf93044;'),
+        migrations.RunSQL('alter index if exists web_subject_languages_language_id_80eca4c1 rename to web_studysubject_languages_language_id_80eca4c1;'),
         migrations.CreateModel(
             name='Subject',
             fields=[

smash/web/tests/view/test_contact_attempt.py

@@ -14,8 +14,8 @@ class ContactAttemptViewTests(LoggedInWithWorkerTestCase):
     def test_contact_attempt_add_get(self):
         subject = create_study_subject()
         response = self.client.get(reverse('web.views.contact_add', kwargs={'subject_id': subject.id}))
-        self.assertContains(response, 'selected">{}'.format(self.worker), 1)
-        self.assertContains(response, 'selected">{}'.format(subject), 1)
+        self.assertContains(response, 'selected>{}'.format(self.worker), 1)
+        self.assertContains(response, 'selected>{}'.format(subject), 1)
 
     def test_contact_attempt_add_post_valid(self):
         subject = create_study_subject()

smash/web/tests/view/test_statistics.py

@@ -15,7 +15,7 @@ class TestStatisticsView(LoggedInTestCase):
         self.assertEqual(response.status_code, 200)
         current_month = datetime.now().month - 1 or 12
         content = response.content
-        self.assertIn('<option value="{}" selected="selected">'.format(current_month), content)
+        self.assertIn('<option value="{}" selected>'.format(current_month), content)
         response = self.client.get(url, {"month": 10, "year": 2017, "subject_type": -1, "visit": -1})
         content = response.content
-        self.assertIn('<option value="10" selected="selected">October', content)
+        self.assertIn('<option value="10" selected>October', content)