Merge pull request #4056 from Lukasa/pytest-httpbin-fix

Disable pytest messing with warnings.
psf · May 24, 2017 · 0371081 · 0371081
2 parents dbb67a1 + f3d310b
commit 0371081
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include README.rst LICENSE NOTICE HISTORY.rst requests/cacert.pem
+include README.rst LICENSE NOTICE HISTORY.rst pytest.ini requests/cacert.pem
 recursive-include tests *.py
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = -p no:warnings
diff --git a/setup.py b/setup.py
@@ -51,7 +51,7 @@ def run_tests(self):
 requires = []
 test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock']
 
-with open('requests/__init__.py', 'r') as fd:
+with open('requests/__init__.py', 'r', 'utf-8') as fd:
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)