Minor fixes for travis builds.

pypr · Dec 2, 2018 · 9931af8 · 9931af8
1 parent b491836
commit 9931af8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,6 @@ install:
     - conda config --add channels conda-forge
     - conda config --add channels defaults
     - conda install -c conda-forge pocl pyopencl cython numpy
-    - conda install -c defaults virtualenv
     - python -c 'import pyopencl as cl'
     - pip install -r requirements.txt
     - python setup.py develop

diff --git a/setup.py b/setup.py
@@ -1,3 +1,4 @@
+import sys
 from setuptools import setup, find_packages
 
 
@@ -10,6 +11,8 @@ def get_version():
 
 
 install_requires = ['mako', 'pytools', 'cython', 'numpy', 'pytest']
+if sys.version_info[0] < 3:
+    install_requires += ['mock>=1.0']
 tests_require = ['pytest']
 
 classes = '''