Merge branch '0.24-dev' into update-flake8

DataDog · Apr 4, 2019 · 909b4c4 · 909b4c4
2 parents c5116b1 + 9f2f78a
commit 909b4c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ddtrace/bootstrap/sitecustomize.py b/ddtrace/bootstrap/sitecustomize.py
@@ -46,7 +46,10 @@
 
 
 def update_patched_modules():
-    for patch in os.environ.get("DATADOG_PATCH_MODULES", '').split(','):
+    modules_to_patch = os.environ.get("DATADOG_PATCH_MODULES")
+    if not modules_to_patch:
+        return
+    for patch in modules_to_patch.split(','):
         if len(patch.split(':')) != 2:
             log.debug("skipping malformed patch instruction")
             continue

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -90,6 +90,7 @@ services:
         image: datadog/docker-library:ddtrace_py
         environment:
             - TOX_SKIP_DIST=True
+            - TEST_DATADOG_INTEGRATION=1
         network_mode: host
         working_dir: /src
         volumes: