Fix integration tests (DataDog#451)

dabcoder · Oct 25, 2019 · 0844926 · 0844926
1 parent 3e3a26d
commit 0844926
Show file tree

Hide file tree

Showing 6 changed files with 365 additions and 790 deletions.
diff --git a/datadog/util/config.py b/datadog/util/config.py
@@ -114,7 +114,10 @@ def get_config(cfg_path=None, options=None):
         config_path = get_config_path(cfg_path, os_name=get_os())
         config = configparser.ConfigParser()
         with open(config_path) as config_file:
-            config.readfp(skip_leading_wsp(config_file))
+            if is_p3k():
+                config.read_file(skip_leading_wsp(config_file))
+            else:
+                config.readfp(skip_leading_wsp(config_file))
 
         # bulk import
         for option in config.options('Main'):

diff --git a/setup.py b/setup.py
@@ -20,11 +20,7 @@ def get_readme_md_contents():
     name="datadog",
     version="0.30.0",
     install_requires=install_reqs,
-    tests_require=[
-        "pytest", "mock",
-        'pillow==5.4.1; python_version == "3.4"',
-        'pillow; python_version != "3.4"',
-    ],
+    tests_require=["pytest", "mock"],
     packages=["datadog", "datadog.api", "datadog.dogstatsd", "datadog.threadstats", "datadog.util", "datadog.dogshell"],
     author="Datadog, Inc.",
     long_description=get_readme_md_contents(),