From c1d5a4a109776e7f7b27811a279cf050a844b682 Mon Sep 17 00:00:00 2001 From: Jakub Roztocil Date: Thu, 29 Aug 2019 08:34:55 +0200 Subject: [PATCH] fix tests --- .travis.yml | 1 + requirements-dev.txt | 3 +-- setup.py | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e89f3739..d340af99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,6 +66,7 @@ install: - | if [[ $TRAVIS_OS_NAME == 'osx' ]]; then if [[ -n "$BREW_PYTHON_PACKAGE" ]]; then + export HOMEBREW_NO_INSTALL_CLEANUP=1 brew update if ! brew list --versions "$BREW_PYTHON_PACKAGE" >/dev/null; then brew install "$BREW_PYTHON_PACKAGE" diff --git a/requirements-dev.txt b/requirements-dev.txt index 66b9e011..e0ccd39c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,5 +6,4 @@ pytest-httpbin>=0.0.6 docutils wheel pycodestyle -pyOpenSSL -twine \ No newline at end of file +twine diff --git a/setup.py b/setup.py index 7103569d..bb304288 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ from setuptools import setup, find_packages from setuptools.command.test import test as TestCommand import httpie +from httpie.compat import is_py27 class PyTest(TestCommand): @@ -33,6 +34,9 @@ tests_require = [ 'mock', ] +if is_py27: + tests_require.append('pyOpenSSL') + install_requires = [ 'requests>=2.21.0',