Merge pull request intercom#82 from jkeyes/release-2.0.beta

jkeyes · jkeyes · commit 6246b0f0c3d2 · 2015-04-03T21:56:27.000+01:00
Release 2.0.beta
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,7 +2,7 @@
 Changelog
 =========
 
-* 2.0.beta (not yet released)
+* 2.0.beta
    * Fixed `UnboundLocalError` in `Request.parse_body`. (`#72 <https://github.com/jkeyes/python-intercom/issues/72>`_)
    * Added support for replies with an empty body. (`#72 <https://github.com/jkeyes/python-intercom/issues/72>`_)
    * Fixed a bug in identifying changed attributes when creating new resources. (`#77 <https://github.com/jkeyes/python-intercom/issues/77>`_)
diff --git a/intercom/__init__.py b/intercom/__init__.py
@@ -26,7 +26,7 @@
 import six
 import time
 
-__version__ = '2.0.alpha'
+__version__ = '2.0.beta'
 
 
 RELATED_DOCS_TEXT = "See https://github.com/jkeyes/python-intercom \
diff --git a/setup.py b/setup.py
@@ -31,6 +31,6 @@
     classifiers=[],
     packages=find_packages(),
     include_package_data=True,
-    install_requires=["requests", "inflection", "certifi"],
+    install_requires=["requests", "inflection", "certifi", "six"],
     zip_safe=False
 )
diff --git a/tests/integration/issues/test_72.py b/tests/integration/issues/test_72.py
@@ -21,5 +21,4 @@ def test(self):
             'created_at': int(time.time()),
             'email': 'me@example.com'
         }
-        print data
         Event.create(**data)

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@`
`31`	`31`	`classifiers=[],`
`32`	`32`	`packages=find_packages(),`
`33`	`33`	`include_package_data=True,`
`34`		`- install_requires=["requests", "inflection", "certifi"],`
	`34`	`+ install_requires=["requests", "inflection", "certifi", "six"],`
`35`	`35`	`zip_safe=False`
`36`	`36`	`)`