Merge pull request #77 from schbetsy/upgrade-django-rest

Upgrade djangorestframework to support Django 1.11
cfpb · Aug 27, 2018 · f4247aa · f4247aa
2 parents 6771c73 + d64deab
commit f4247aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 48 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,23 +1,10 @@
 [run]
-source = 
-    complaint_search
-
 omit = 
-    */wsgi.py
-    *admin*
-    *migrations/*
-    *templatetags/*
-    */site-packages*
-    */python2.7/*
-    *setup.py
-    *manage.py
-    *test*
-    *__init__.py
-    *settings.py
-    *urls.py
+    .tox/*
 
 [report]
 exclude_lines = 
     pragma: no cover
     if __name__ == .__main__.:
-    datetime.now()
+    datetime.now()
+    diff.print_full()
diff --git a/complaint_search/tests/test_es_interface.py b/complaint_search/tests/test_es_interface.py
@@ -171,7 +171,6 @@ def test_search_no_param__valid(self, mock_rget, mock_scroll, mock_count, mock_s
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search no param"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -200,7 +199,6 @@ def test_search_agg_exclude__valid(self, mock_rget, mock_scroll, mock_count, moc
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search agg exclude"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -236,7 +234,6 @@ def test_search_with_format_json__valid(self, mock_urlencode,
         act_body = mock_jdump.call_args[0][0]
         diff = deep.diff(act_body, body)
         if diff:
-            print "format={}".format(format)
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertEqual(len(mock_urlencode.call_args), 2)
@@ -287,7 +284,6 @@ def test_search_with_format_csv__valid(self, mock_urlencode, mock_jdump, mock_rg
         act_body = mock_jdump.call_args[0][0]
         diff = deep.diff(act_body, body)
         if diff:
-            print "format={}".format(format)
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertEqual(len(mock_urlencode.call_args), 2)
@@ -329,9 +325,7 @@ def test_search_with_field__valid(self, mock_scroll, mock_count, mock_search, mo
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search with field"
             diff.print_full()
-            print "body"
         self.assertIsNone(deep.diff(act_body, body))
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
         mock_scroll.assert_not_called()
@@ -357,7 +351,6 @@ def test_search_with_field_all__valid(self, mock_scroll, mock_count, mock_search
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search with field _all"
             diff.print_full()
 
         self.assertIsNone(deep.diff(act_body, body))
@@ -479,7 +472,6 @@ def test_search_with_search_term_match__valid(self, mock_scroll, mock_count, moc
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search term match"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -505,7 +497,6 @@ def test_search_with_search_term_qsq_and__valid(self, mock_scroll, mock_count, m
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search term qsq and"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -531,7 +522,6 @@ def test_search_with_search_term_qsq_or__valid(self, mock_scroll, mock_count, mo
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search term qsq or"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -557,7 +547,6 @@ def test_search_with_search_term_qsq_not__valid(self, mock_scroll, mock_count, m
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search term qsq not"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -583,7 +572,6 @@ def test_search_with_search_term_qsq_to__valid(self, mock_scroll, mock_count, mo
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search term qsq to"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -609,7 +597,6 @@ def test_search_with_date_received_min__valid(self, mock_scroll, mock_count, moc
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search with date_received_min"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -635,7 +622,6 @@ def test_search_with_date_received_max__valid(self, mock_scroll, mock_count, moc
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search with date_received_max"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -661,7 +647,6 @@ def test_search_with_company_received_min__valid(self, mock_scroll, mock_count,
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search with company_received_min"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -687,7 +672,6 @@ def test_search_with_company_received_max__valid(self, mock_scroll, mock_count,
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search with company_received_max"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')
@@ -713,7 +697,6 @@ def test_search_with_company__valid(self, mock_scroll, mock_count, mock_search,
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "company"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -741,7 +724,6 @@ def test_search_with_company_agg_exclude__valid(self, mock_scroll, mock_count, m
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "company agg exclude"
             diff.print_full()
 
         self.assertIsNone(deep.diff(act_body, body))
@@ -769,7 +751,6 @@ def test_search_with_product__valid(self, mock_scroll, mock_count, mock_search,
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "product"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -797,7 +778,6 @@ def test_search_with_issue__valid(self, mock_scroll, mock_count, mock_search, mo
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "issue"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -824,7 +804,6 @@ def test_search_with_state__valid(self, mock_scroll, mock_count, mock_search, mo
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "state"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -851,7 +830,6 @@ def test_search_with_zip_code__valid(self, mock_scroll, mock_count, mock_search,
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "zip_code"
             diff.print_full()
 
         self.assertIsNone(deep.diff(act_body, body))
@@ -880,7 +858,6 @@ def test_search_with_zip_code_agg_exclude__valid(self, mock_scroll, mock_count,
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "zip_code agg exclude"
             diff.print_full()
 
         self.assertIsNone(deep.diff(act_body, body))
@@ -908,7 +885,6 @@ def test_search_with_timely__valid(self, mock_scroll, mock_count, mock_search, m
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "timely"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -936,7 +912,6 @@ def test_search_with_company_response__valid(self, mock_scroll, mock_count, mock
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "company_response"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -964,7 +939,6 @@ def test_search_with_company_public_response__valid(self, mock_scroll, mock_coun
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "company_public_response.raw"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -991,7 +965,6 @@ def test_search_with_consumer_consent_provided__valid(self, mock_scroll, mock_co
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "consumer_consent_provided.raw"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -1018,7 +991,6 @@ def test_search_with_submitted_via__valid(self, mock_scroll, mock_count, mock_se
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "submitted_via"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -1045,7 +1017,6 @@ def test_search_with_tags__valid(self, mock_scroll, mock_count, mock_search, moc
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "tags"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -1072,7 +1043,6 @@ def test_search_with_has_narrative__valid(self, mock_scroll, mock_count, mock_se
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "has_narrative"
             diff.print_full()
         self.assertIsNone(deep.diff(act_body, body))
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
@@ -1101,7 +1071,6 @@ def test_search_no_highlight__valid(self, mock_rget, mock_scroll, mock_count, mo
         act_body = mock_search.call_args_list[0][1]['body']
         diff = deep.diff(act_body, body)
         if diff:
-            print "search no highlight"
             diff.print_full()
         self.assertDictEqual(mock_search.call_args_list[0][1]['body'], body)
         self.assertEqual(mock_search.call_args_list[0][1]['index'], 'INDEX')

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 install_requires = [
     'Django>=1.8,<1.12',
-    'djangorestframework>=3.1,<3.2',
+    'djangorestframework==3.6.4', # Latest version that supports both Django 1.8 and 1.11
     'elasticsearch>=2.4.1,<3',
     'requests>=2.14,<2.15',
     'urllib3>=1.21,<1.22',