Merge release/0.5.5 into master

untitaker · web-flow · commit c993f594f02d · 2018-11-15T22:02:20.000+01:00
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -1,7 +1,7 @@
 import socket
 
 
-VERSION = "0.5.4"
+VERSION = "0.5.5"
 DEFAULT_SERVER_NAME = socket.gethostname() if hasattr(socket, "gethostname") else None
 DEFAULT_OPTIONS = {
     "dsn": None,
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name="sentry-sdk",
-    version="0.5.4",
+    version="0.5.5",
     author="Sentry Team and Contributors",
     author_email="hello@getsentry.com",
     url="https://github.com/getsentry/sentry-python",
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
@@ -1,3 +1,5 @@
+import platform
+
 import pytest
 
 from werkzeug.test import Client
@@ -164,6 +166,9 @@ def test_sql_dict_query_params(sentry_init, capture_events):
     assert crumb["message"] == ("SELECT count(*) FROM people_person WHERE foo = 10")
 
 
+@pytest.mark.skipif(
+    platform.python_implementation() == "PyPy", reason="psycopg broken on pypy"
+)
 @pytest.mark.django_db
 def test_sql_psycopg2_string_composition(sentry_init, capture_events):
     sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
diff --git a/tox.ini b/tox.ini
@@ -42,7 +42,7 @@ envlist =
 deps =
     -r test-requirements.txt
 
-    django: psycopg2>=2.7.5
+    py{2.7,3.4,3.5,3.6,3.7}-django: psycopg2>=2.7.5
 
     django-{1.6,1.7,1.8}: pytest-django<3.0
     django-{1.9,1.10,1.11,2.0,2.1,dev}: pytest-django>=3.0
