Merge branch 'conda' into 'master'

Fix conda env See merge request inducer/pyopencl!74

Merge branch 'conda' into 'master'
ab50b3f1 · Andreas Klöckner · 3631ac2c · 9e2bb61d · ab50b3f1
Commit ab50b3f1 authored 6 years ago by Andreas Klöckner
--- a/.test-conda-env-py3.yml
+++ b/.test-conda-env-py3.yml
@@ -7,6 +7,5 @@ dependencies:
 - git
 - conda-forge::numpy
 - pocl
- osx-pocl-opencl
 - mako
 - pybind11