Merge pull request #54 from tpaviot/review/prepare-676

prepare smesh-6.7.6

.travis.yml

@@ -3,14 +3,18 @@ language: cpp
 cache:
  apt: true
 
+env:
+  global:
+    secure: "QNmikTCQbLuClaVFWUI+PTDBTZfcJyXgYnfbPe3WWHGf7Cm1oX+2J31duoGOHMOESNXElg2wXdT9Qby3EFRGyrAMCflJc6m3iQY703F+7vfG6hL2Sn7xKfyDQgk5gkNtORdpwyjgiMdieNu6GvzTvXjwgzcUvAvqxsTPc+erF10="
+
 matrix:
   include:
   - os: linux
     compiler: gcc
-    env: MATRIX_EVAL="CC=gcc && CXX=g++"
+    env: MATRIX_EVAL="CC=gcc && CXX=g++" CONDA_UPLOAD="ON"
   - os: linux
     compiler: gcc
-    env: MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+    env: MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" CONDA_UPLOAD="OFF"
     addons:
       apt:
         sources:
@@ -19,7 +23,7 @@ matrix:
           - g++-5
   - os: linux
     compiler: gcc
-    env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+    env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" CONDA_UPLOAD="OFF"
     addons:
       apt:
         sources:
@@ -28,7 +32,7 @@ matrix:
           - g++-6
   - os: linux
     compiler: gcc
-    env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+    env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" CONDA_UPLOAD="OFF"
     addons:
       apt:
         sources:
@@ -37,14 +41,14 @@ matrix:
           - g++-7
   - os: linux
     compiler: clang
-    env: MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
+    env: MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0" CONDA_UPLOAD="OFF"
     addons:
       apt:
         sources:
           - llvm-toolchain-trusty-4.0
         packages:
           - clang-4.0
-  - env: ARCH="x86_64" MACOSX_DEPLOYMENT_TARGET="10.9"
+  - env: ARCH="x86_64" MACOSX_DEPLOYMENT_TARGET="10.9" CONDA_UPLOAD="ON"
     os: osx
     osx_image: xcode8.3
 
@@ -78,11 +82,13 @@ before_install:
   - conda config --add channels https://conda.anaconda.org/oce
 
 script:
-  - conda build ci/conda  --dirty --no-remove-work-dir
+  - conda build ci/conda --dirty --no-remove-work-dir
 
 after_success:
-  - python ci/move-conda-package.py
-  - anaconda -t $BINSTAR_TOKEN upload *.bz2 --force;
+  - if [[ "$CONDA_UPLOAD" == "ON" ]]; then
+      python ci/move-conda-package.py;
+      anaconda -t $BINSTAR_TOKEN upload *.bz2 --force;
+    fi
 
 branches:
   only:

CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8)
 set(SMESH_VERSION_MAJOR 6)
 set(SMESH_VERSION_MINOR 7)
 set(SMESH_VERSION_PATCH 6)
-set(SMESH_VERSION_TWEAK -dev)
+set(SMESH_VERSION_TWEAK)
 
 
 #####################

NEWS

@@ -1,3 +1,14 @@
+Version 6.7.6 - February 2018
+=============================
+This version is binary compatible with smesh-6.7.3, smesh-6.7.4 and smesh-6.7.5
+
+* [clang-error-fix] ordered comparison between pointer and zero
+
+* improved ci travis/appveyor
+
+Users who contributed to this release:
+  Thomas Paviot
+
 Version 6.7.5 - August 2017
 ===========================
 This version is binary compatible with smesh-6.7.3 and smesh-6.7.4

README.md

@@ -37,20 +37,20 @@ How to stay up to date with latest developements?
 Install with conda
 ------------------
 
-$ conda install -c pythonocc -c dlr-sc -c oce smesh=6.7.4
+$ conda install -c pythonocc -c dlr-sc -c oce smesh=6.7.6
 
 Build - Install
 ---------------
 
-For both OSX, Linux and Windows (please use Mingw on Windows), the instructions are the same.
+For both OSX, Linux and Windows, the instructions are the same.
 
 Requirements
 ------------
   * a c++ and a fortran compiler 
 
   * cmake 2.8 or higher
 
-  * oce 0.18 or oce-0.18.1
+  * oce 0.18.x
 
 Build
 -----

appveyor.yml

@@ -11,8 +11,6 @@ environment:
     PYTHONIOENCODING: "UTF-8"
 
   matrix:
-    # Note: Because we have to separate the py2 and py3 components due to compiler version, we have a race condition for non-python packages.
-    # Not sure how to resolve this, but maybe we should be tracking the VS version in the build string anyway?
     - TARGET_ARCH: "x86"
       ARCH: "32"
       CONDA_PY: "27"