Merge pull request #716 from tpaviot/review/update-ci

update travis and appveyor

Author: tpaviot

.travis.yml

@@ -27,7 +27,7 @@ git:
 # after that, copy/paste the secure on the following line
 env:
   global:
-    - secure: "Bqor4TrYqeJUkjiIHjCq/e3xt/jAoU3Q5kwG/ej+QxaiT6hmkirX3Io3rHxNTbS+mYMAMTbtkkpGqYIYIYtNVx8jGYLdwOzNcuW/wzZf9VuAW/rnjx2lzuYRhHk3GOylSPUU06JHvXDmZvdMxetNBeWaE5hGuJsC9liA+stDepA="
+    - secure: "Mu6SQsBmz2inttfIj3pXk4lx6ZXNs7MAq1agDgnGJknQTTi4ta0H+usxKhhGvxkh4eGgX01HuXAbPejU0W9xatHvYDQ3piKvqv672TrhYShHA4bWJke3q88BezSYaDQ+UBTmP5DD/ZFbprH+6bP9WqpRaYGC6UHbFkjRKEd2bk4="
 
 addons:
   apt:
@@ -38,12 +38,6 @@ addons:
 
 matrix:
   include:
-    - env: PYTHON="2.7" CONDA_PY=27 ARCH="x86_64"
-      os: linux
-      dist: bionic
-    - env: PYTHON="2.7" CONDA_PY=27 ARCH="x86_64"
-      os: osx
-      osx_image: xcode9.4
     - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64"
       os: linux
       dist: bionic
@@ -85,6 +79,7 @@ before_install:
   - yes | ./miniconda.sh -b -p $HOME/miniconda
   #- bash miniconda.sh -b -p -f $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$HOME/miniconda/lib:$PATH"
+  - export PYTHONUNBUFFERED=1
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
@@ -96,13 +91,11 @@ before_install:
   # Useful for debugging any issues with conda
   - conda info -a
   # download/install OCE from DLR-SC channel
-  - conda config --add channels https://conda.anaconda.org/dlr-sc
-  - conda config --add channels https://conda.anaconda.org/conda-forge
-  - conda config --add channels https://conda.anaconda.org/tpaviot
-  - conda config --add channels https://conda.anaconda.org/oce
-  - conda config --add channels https://conda.anaconda.org/pythonocc
-  
-
+  - conda config --add channels dlr-sc
+  - conda config --add channels conda-forge
+  - conda config --add channels tpaviot
+  - conda config --add channels oce
+  - conda config --add channels pythonocc
 
 script:
   - conda build ci/conda --dirty --no-remove-work-dir

appveyor.yml

@@ -20,30 +20,6 @@ environment:
     PYTHONIOENCODING: "UTF-8"
 
   matrix:
-    - PYTHON: "C:\\Python27_32"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      CONDA_PY: "27"
-      CONDA_NPY: "18"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda"
-    - PYTHON: "C:\\Python27_64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      CONDA_PY: "27"
-      CONDA_NPY: "18"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
-    - PYTHON: "C:\\Python35_32"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      CONDA_PY: "35"
-      CONDA_NPY: "18"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda35"
-    - PYTHON: "C:\\Python35_64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      CONDA_PY: "35"
-      CONDA_NPY: "18"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
     - PYTHON: "C:\\Python36_32"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
@@ -94,11 +70,11 @@ install:
     - cmd: conda config --set show_channel_urls true
     - cmd: conda update conda
     - cmd: conda install conda-build anaconda-client
-    - cmd: conda config --add channels https://conda.anaconda.org/conda-forge
     - cmd: conda config --add channels https://conda.anaconda.org/dlr-sc
     - cmd: conda config --add channels https://conda.anaconda.org/oce
     - cmd: conda config --add channels https://conda.anaconda.org/pythonocc
     - cmd: conda config --add channels https://conda.anaconda.org/tpaviot
+    - cmd: set PYTHONBUFFERED=1
 
 build: off
 

ci/conda/bld.bat

@@ -6,7 +6,7 @@ set MY_PY_VER=%PY_VER:.=%
 
 REM Configure step
 cmake -G "Ninja" -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
- -DPYTHONOCC_BUILD_TYPE=RelWithDebInfo ^
+ -DPYTHONOCC_BUILD_TYPE=Release ^
  -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
  -DCMAKE_SYSTEM_PREFIX_PATH="%LIBRARY_PREFIX%" ^
  -DPYTHON_EXECUTABLE:FILEPATH="%PYTHON%" ^

ci/conda/build.sh

@@ -14,7 +14,7 @@ fi
 
 # Configure step
 cmake -G Ninja -DCMAKE_INSTALL_PREFIX=$PREFIX \
- -DPYTHONOCC_BUILD_TYPE=MinSizeRel \
+ -DPYTHONOCC_BUILD_TYPE=Release \
  -DCMAKE_PREFIX_PATH=$PREFIX \
  -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
  -DPYTHON_EXECUTABLE:FILEPATH=$PYTHON \

ci/conda/meta.yaml

@@ -14,16 +14,13 @@ build:
 
   number: {{ GIT_DESCRIBE_NUMBER }}
   binary_relocation: false [osx]
-  features:
-    - vc9               [win and py27]
-    - vc14              [win and py35]
-    - vc14              [win and py36]
 
 requirements:
   build:
     - python
     - oce ==0.18.3
-    - tbb ==2018_20171205
+    - tbb
+    - tbb-devel
     - cmake
     - ninja ==1.8.2
     - swig ==3.0.12
@@ -33,18 +30,17 @@ requirements:
   run:
     - oce ==0.18.3
     - python
-    - tbb >=2018_20171205
-    - freetype >=2.7
+    - tbb
+    - freetype
     - smesh ==6.7.6
     - six
 
 test:
-  requires:
-    - numpy
-    - wxpython          [py27]
-    - pyside            [py27]
-    - pyqt >=5
-    - smesh ==6.7.6
+  imports:
+    - OCC
+    - OCC.Core.BRepPrimAPI
+
+    
 
 about:
   home: https://github.com/tpaviot/pythonocc-core