Merge branch 'dev' into POP-2278

Author: NathanWorkman

.flake8

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

.github/workflows/pythonpackage.yml

@@ -0,0 +1,34 @@
+name: python-tests
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [2.7, 3.5, 3.6, 3.7]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Lint with flake8
+      run: |
+        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
+        # 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
+        pytest

CONTRIBUTING.md

@@ -24,6 +24,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,

README.md

@@ -1,4 +1,7 @@
 # python-demandapi-client
+
+<a href="https://github.com/dynata/python-demandapi-client"><img alt="GitHub Actions status" src="https://github.com/dynata/python-demandapi-client/workflows/python-tests/badge.svg"></a>
+
 A Python client library for the [Dynata Demand API](https://developers.dynata.com/)
 ## Setup
 

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
 from dynatademand.errors import DemandAPIError
 
@@ -25,7 +20,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)
@@ -43,7 +42,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)