fixed tests to pass linting

Author: wogsland

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+exclude=.git,.pytest_cache,venv

.github/workflows/pythonpackage.yml

@@ -26,8 +26,8 @@ jobs:
         pip install flake8
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        # the GitHub editor is 127 chars wide
+        flake8 . --count --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
         pip install pytest

CONTRIBUTING.md

@@ -23,6 +23,14 @@ Linting software is strongly recommended to improve code quality and maintain re
 
 Read more [here](http://flake8.pycqa.org/en/latest/)
 
+To lint the files,
+
+    virtualenv venv
+    . venv/bin/activate
+    pip install flake8
+    flake8 . --count --max-complexity=10 --max-line-length=127 --statistics
+    deactivate
+
 ### Testing
 
 To run the tests,

tests/test_attributes.py

@@ -5,11 +5,6 @@
 import unittest
 import responses
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 from dynatademand.api import DemandAPIClient
 
 BASE_HOST = "http://test-url.example"

tests/test_categories.py

@@ -5,11 +5,6 @@
 import unittest
 import responses
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 from dynatademand.api import DemandAPIClient
 
 BASE_HOST = "http://test-url.example"
@@ -24,7 +19,11 @@ def setUp(self):
     def test_get_survey_topics(self):
         with open('./tests/test_files/get_survey_topics.json', 'r') as survey_topics_file:
             survey_topics_json = json.load(survey_topics_file)
-        responses.add(responses.GET, '{}/sample/v1/categories/surveyTopics'.format(BASE_HOST), json=survey_topics_json, status=200)
+        responses.add(
+            responses.GET,
+            '{}/sample/v1/categories/surveyTopics'.format(BASE_HOST),
+            json=survey_topics_json,
+            status=200)
         self.api.get_survey_topics()
         self.assertEqual(len(responses.calls), 1)
         self.assertEqual(responses.calls[0].response.json(), survey_topics_json)

tests/test_countries.py

@@ -5,11 +5,6 @@
 import unittest
 import responses
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 from dynatademand.api import DemandAPIClient
 
 BASE_HOST = "http://test-url.example"

tests/test_events.py

@@ -5,11 +5,6 @@
 import unittest
 import responses
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 from dynatademand.api import DemandAPIClient
 
 BASE_HOST = "http://test-url.example"

tests/test_feasibility_pricing.py

@@ -5,11 +5,6 @@
 import unittest
 import responses
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 from dynatademand.api import DemandAPIClient
 
 BASE_HOST = "http://test-url.example"

tests/test_line_items.py

@@ -5,11 +5,6 @@
 import unittest
 import responses
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 from dynatademand.api import DemandAPIClient
 
 BASE_HOST = "http://test-url.example"
@@ -24,7 +19,11 @@ def setUp(self):
     def test_get_line_item(self):
         with open('./tests/test_files/get_line_item.json', 'r') as line_item_file:
             line_item_json = json.load(line_item_file)
-        responses.add(responses.GET, '{}/sample/v1/projects/1/lineItems/100'.format(BASE_HOST), json=line_item_json, status=200)
+        responses.add(
+            responses.GET,
+            '{}/sample/v1/projects/1/lineItems/100'.format(BASE_HOST),
+            json=line_item_json,
+            status=200)
         self.api.get_line_item(1, 100)
         self.assertEqual(len(responses.calls), 1)
         self.assertEqual(responses.calls[0].response.json(), line_item_json)
@@ -42,7 +41,11 @@ def test_get_line_items(self):
     def test_get_line_item_detailed_report(self):
         with open('./tests/test_files/get_line_item_detailed_report.json', 'r') as line_item_detailed_report_file:
             line_item_detailed_report_json = json.load(line_item_detailed_report_file)
-        responses.add(responses.GET, '{}/sample/v1/projects/1/lineItems/100/detailedReport'.format(BASE_HOST), json=line_item_detailed_report_json, status=200)
+        responses.add(
+            responses.GET,
+            '{}/sample/v1/projects/1/lineItems/100/detailedReport'.format(BASE_HOST),
+            json=line_item_detailed_report_json,
+            status=200)
         self.api.get_line_item_detailed_report(1, 100)
         self.assertEqual(len(responses.calls), 1)
         self.assertEqual(responses.calls[0].response.json(), line_item_detailed_report_json)

tests/test_projects.py

@@ -5,11 +5,6 @@
 import unittest
 import responses
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 from dynatademand.api import DemandAPIClient
 
 BASE_HOST = "http://test-url.example"
@@ -42,7 +37,11 @@ def test_get_projects(self):
     def test_get_project_detailed_report(self):
         with open('./tests/test_files/get_project_detailed_report.json', 'r') as project_detailed_report_file:
             project_detailed_report_json = json.load(project_detailed_report_file)
-        responses.add(responses.GET, '{}/sample/v1/projects/1/detailedReport'.format(BASE_HOST), json=project_detailed_report_json, status=200)
+        responses.add(
+            responses.GET,
+            '{}/sample/v1/projects/1/detailedReport'.format(BASE_HOST),
+            json=project_detailed_report_json,
+            status=200)
         self.api.get_project_detailed_report(1)
         self.assertEqual(len(responses.calls), 1)
         self.assertEqual(responses.calls[0].response.json(), project_detailed_report_json)
@@ -52,6 +51,10 @@ def test_create_project(self):
         # Tests creating a project. This also tests validating the project data as part of `api.create_project`.
         with open('./tests/test_files/examples/project_new.json', 'r') as new_project_file:
             new_project_data = json.load(new_project_file)
-        responses.add(responses.POST, '{}/sample/v1/projects'.format(BASE_HOST), json={'status': {'message': 'success'}}, status=200)
+        responses.add(
+            responses.POST,
+            '{}/sample/v1/projects'.format(BASE_HOST),
+            json={'status': {'message': 'success'}},
+            status=200)
         self.api.create_project(new_project_data)
         self.assertEqual(len(responses.calls), 1)