Merge pull request #5 from micahhausler/develop

v0.2
ambitioninc · Nov 11, 2014 · 13d472c · 13d472c
2 parents 7b130b7 + f5be7d1
commit 13d472c
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -69,9 +69,9 @@ Release Checklist
 
 Before a new release, please go through the following checklist:
 
+* Add a release note in docs/release_notes.rst
 * Bump version in pagerduty_api/version.py
 * Git tag the version
-* Add a release note in docs/release_notes.rst
 * Upload to pypi
 
 Vulnerability Reporting

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+v0.2
+----
+This version fixes interaction with PagerDuty's Events API.
+
 v0.1
 ----
 This is the initial release of pagerduty-api.

diff --git a/pagerduty_api/alerts.py b/pagerduty_api/alerts.py
@@ -1,4 +1,5 @@
 import hashlib
+import json
 import logging
 
 import requests
@@ -102,11 +103,7 @@ def trigger(self, description, incident_key=None, client=None, client_url=None,
         }
         LOG.info('Triggering PagerDuty incident {0}'.format(incident_key))
 
-        response = requests.post(
-            url=self.URL,
-            data=data,
-            headers=self.headers
-        )
+        response = requests.post(url=self.URL, data=json.dumps(data), headers=self.headers)
         return response.json()
 
     def acknowledge(self, incident_key=None, description=None, details=None):
@@ -156,11 +153,7 @@ def acknowledge(self, incident_key=None, description=None, details=None):
         }
         LOG.info('Acknowledging PagerDuty incident {0}'.format(incident_key))
 
-        response = requests.post(
-            url=self.URL,
-            data=data,
-            headers=self.headers
-        )
+        response = requests.post(url=self.URL, data=json.dumps(data), headers=self.headers)
         return response.json()
 
     def resolve(self, incident_key=None, description=None, details=None):
@@ -210,9 +203,5 @@ def resolve(self, incident_key=None, description=None, details=None):
         }
         LOG.info('Resolving PagerDuty incident {0}'.format(incident_key))
 
-        response = requests.post(
-            url=self.URL,
-            data=data,
-            headers=self.headers
-        )
+        response = requests.post(url=self.URL, data=json.dumps(data), headers=self.headers)
         return response.json()
diff --git a/pagerduty_api/tests/alarm_tests.py b/pagerduty_api/tests/alarm_tests.py
@@ -1,5 +1,6 @@
 import logging
 
+import json
 import unittest
 from mock import patch
 import requests
@@ -54,18 +55,18 @@ def test_trigger_success(self, mock_post):
 
         # Assert we made one
         mock_post.assert_called_once_with(
-            data={
+            data=json.dumps({
                 'service_key': self.service_key,
                 'event_type': 'trigger',
                 'incident_key': self.incident_key,
                 'description': 'No data received',
                 'client': 'apple_0033c42e190872c508666ab6acbbd2e7',
                 'client_url': 'https://apple.ambition.com',
                 'details': {'some_key': 'some_value'},
-                },
+            }),
             headers=self.alert.headers,
             url=self.alert.URL,
-            )
+        )
 
     @patch.object(requests, 'post')
     def test_acknowledge_success(self, mock_post):
@@ -81,16 +82,16 @@ def test_acknowledge_success(self, mock_post):
 
         # Assert we made one
         mock_post.assert_called_once_with(
-            data={
+            data=json.dumps({
                 'service_key': self.service_key,
                 'event_type': 'acknowledge',
                 'incident_key': self.incident_key,
                 'description': 'No data received',
                 'details': {'some_key': 'some_value'},
-                },
+            }),
             headers=self.alert.headers,
             url=self.alert.URL,
-            )
+        )
 
     @patch.object(requests, 'post')
     def test_acknowledge_raises_error(self, mock_post):
@@ -120,16 +121,16 @@ def test_resolve_success(self, mock_post):
 
         # Assert we made one
         mock_post.assert_called_once_with(
-            data={
+            data=json.dumps({
                 'service_key': self.service_key,
                 'event_type': 'resolve',
                 'incident_key': self.incident_key,
                 'description': 'No data received',
                 'details': {'some_key': 'some_value'},
-                },
+            }),
             headers=self.alert.headers,
             url=self.alert.URL,
-            )
+        )
 
     @patch.object(requests, 'post')
     def test_resolve_raises_error(self, mock_post):

diff --git a/pagerduty_api/version.py b/pagerduty_api/version.py
@@ -1 +1 @@
-__version__ = '0.1'
+__version__ = '0.2'
diff --git a/setup.cfg b/setup.cfg
@@ -5,5 +5,7 @@ cover-min-percentage=100
 cover-package=pagerduty_api
 [flake8]
 max-line-length = 120
-exclude = docs,env,*.egg
-max-complexity = 10
+exclude = docs,env,venv,*.egg
+max-complexity = 10
+[bdist_wheel]
+universal = 1