updated conda build/travis to be independant from building platform

tpaviot · tpaviot · commit b40215ab792a · 2019-11-28T16:34:13.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -54,11 +54,11 @@ jobs:
       os: osx
       osx_image: xcode9.4
 # Windows
-    - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
+    - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64" CC="cl.exe" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
       os: windows
-    - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
+    - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64" CC="cl.exe" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
       os: windows
-    - env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
+    - env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64" CC="cl.exe" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
       os: windows
 
 # Use miniconda to install binary versions of numpy etc. from continuum
diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
@@ -13,16 +13,22 @@ build:
 
 requirements:
   build:
-    - python
-    - opencascade ==7.4.0
+    - {{ compiler('cxx') }}
+    - {{ cdt('libx11-devel') }}         # [linux]
+    - {{ cdt('xorg-x11-proto-devel') }} # [linux]
+    - {{ cdt('mesa-libgl-devel') }}     # [linux]
+    - ninja
     - cmake
-    - ninja ==1.8.2
-    - swig ==4.0.1
+    - swig >=3.0.11
+
+  host:
+    - python {{ python }}
+    - opencascade ==7.4.0
 
   run:
+    - pyqt
     - opencascade ==7.4.0
-    - python
-    - six
+    - python {{ python }}
 
 test:
   imports:
