Merge pull request #407 from tpaviot/review/conda

Review/conda

Author: tpaviot

.travis.yml

@@ -37,21 +37,25 @@ matrix:
       os: linux
     - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64"
       os: osx
+    - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64"
+      os: linux
+    - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64"
+      os: osx
 # Use miniconda to install binary versions of numpy etc. from continuum
 # analytic's repository. Follows an approach described by Dan Blanchard:
 # https://gist.github.com/dan-blanchard/7045057
 before_install:
   - if [ ${PYTHON:0:1} == "2" ]; then
       if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-      wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-$ARCH.sh -O miniconda.sh;
+      wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
       else
-      wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-$ARCH.sh -O miniconda.sh;
+      wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh;
       fi;
       else
       if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-      wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-$ARCH.sh -O miniconda.sh;
+      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
       else
-      wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-$ARCH.sh -O miniconda.sh;
+      wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
       fi;
     fi;
   - chmod +x miniconda.sh

appveyor.yml

@@ -1,4 +1,4 @@
-version: pythonocc-core-0.17.2-dev.{build}
+version: pythonocc-core-0.17.3-dev.{build}
 
 environment:
   global:
@@ -36,6 +36,18 @@ environment:
       CONDA_PY: "35"
       CONDA_NPY: "18"
       CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
+    - PYTHON: "C:\\Python36_32"
+      PYTHON_VERSION: "3.6"
+      PYTHON_ARCH: "32"
+      CONDA_PY: "36"
+      CONDA_NPY: "18"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda36"
+    - PYTHON: "C:\\Python36_64"
+      PYTHON_VERSION: "3.6"
+      PYTHON_ARCH: "64"
+      CONDA_PY: "36"
+      CONDA_NPY: "18"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
 # We always use a 64-bit machine, but can build x86 distributions
 # with the TARGET_ARCH variable (which is used by CMD_IN_ENV).
 platform:
@@ -61,6 +73,7 @@ install:
     - cmd: conda config --set show_channel_urls true
     - cmd: conda update --yes --quiet conda
     - cmd: conda install --yes conda-build
+    - "%CMD_IN_ENV% conda config --add channels https://conda.anaconda.org/conda-forge"
     - "%CMD_IN_ENV% conda config --add channels https://conda.anaconda.org/dlr-sc"
     - "%CMD_IN_ENV% conda config --add channels https://conda.anaconda.org/oce"
 

ci/appveyor/obvci_appveyor_python_build_env.cmd

@@ -1,94 +1,66 @@
-:: EXPECTED ENV VARS: TARGET_ARCH (either x86 or x64)
-::                    CONDA_PY (either 27, 33, 35 etc. - only major version is extracted)
+:: To build extensions for 64 bit Python 3.5 or later no special environment needs
+:: to be configured.
 ::
-::
-:: To build extensions for 64 bit Python 3, we need to configure environment
+:: To build extensions for 64 bit Python 3.4 or earlier, we need to configure environment
 :: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
 :: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
 ::
 :: To build extensions for 64 bit Python 2, we need to configure environment
 :: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
 :: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
 ::
-:: 32 bit builds, and 64-bit builds for 3.5 and beyond, do not require specific
-:: environment configurations.
+:: 32 bit builds do not require specific environment configurations.
 ::
 :: Note: this script needs to be run with the /E:ON and /V:ON flags for the
 :: cmd interpreter, at least for (SDK v7.0)
 ::
 :: More details at:
 :: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: http://stackoverflow.com/a/13751649/163740
-::
-:: Author: Phil Elson
-:: Original Author: Olivier Grisel (https://github.com/ogrisel/python-appveyor-demo)
-:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
-::
-:: Notes about batch files for Python people:
-::
-:: Quotes in values are literally part of the values:
-::      SET FOO="bar"
-:: FOO is now five characters long: " b a r "
-:: If you don't want quotes, don't include them on the right-hand side.
+:: https://stackoverflow.com/a/13751649/163740
 ::
-:: The CALL lines at the end of this file look redundant, but if you move them
-:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y
-:: case, I don't know why.
+:: Original Author: Olivier Grisel
+:: License: CC0 1.0 Universal: https://creativecommons.org/publicdomain/zero/1.0/
+:: This version based on updates for python 3.5 by Phil Elson at:
+::     https://github.com/pelson/Obvious-CI/tree/master/scripts
+
 @ECHO OFF
 
 SET COMMAND_TO_RUN=%*
 SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
 
-:: Extract the major and minor versions, and allow for the minor version to be
-:: more than 9.  This requires the version number to have two dots in it.
-SET MAJOR_PYTHON_VERSION=%CONDA_PY:~0,1%
-
-IF "%CONDA_PY:~2,1%" == "" (
-    :: CONDA_PY style, such as 27, 34 etc.
-    SET MINOR_PYTHON_VERSION=%CONDA_PY:~1,1%
-) ELSE (
-    IF "%CONDA_PY:~3,1%" == "." (
-     SET MINOR_PYTHON_VERSION=%CONDA_PY:~2,1%
-    ) ELSE (
-     SET MINOR_PYTHON_VERSION=%CONDA_PY:~2,2%
-    )
-)
-
-:: Based on the Python version, determine what SDK version to use, and whether
-:: to set the SDK for 64-bit.
-IF %MAJOR_PYTHON_VERSION% == 2 (
+SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
+SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
+IF %MAJOR_PYTHON_VERSION% == "2" (
     SET WINDOWS_SDK_VERSION="v7.0"
     SET SET_SDK_64=Y
-) ELSE (
-    IF %MAJOR_PYTHON_VERSION% == 3 (
-        SET WINDOWS_SDK_VERSION="v7.1"
-        IF %MINOR_PYTHON_VERSION% LEQ 4 (
-            SET SET_SDK_64=Y
-        ) ELSE (
-            SET SET_SDK_64=N
-        )
+) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
+    SET WINDOWS_SDK_VERSION="v7.1"
+    IF %MINOR_PYTHON_VERSION% LEQ 4 (
+        SET SET_SDK_64=Y
     ) ELSE (
-        ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-        EXIT /B 1
+        SET SET_SDK_64=N
     )
+) ELSE (
+    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
+    EXIT 1
 )
 
-IF "%TARGET_ARCH%"=="x64" (
+IF "%PYTHON_ARCH%"=="64" (
     IF %SET_SDK_64% == Y (
         ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
         SET DISTUTILS_USE_SDK=1
         SET MSSdk=1
         "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
         "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
         ECHO Executing: %COMMAND_TO_RUN%
-        call %COMMAND_TO_RUN% || EXIT /B 1
-    ) ELSE (
+        call %COMMAND_TO_RUN% || EXIT 1
+    )  ELSE (
         ECHO Using default MSVC build environment for 64 bit architecture
         ECHO Executing: %COMMAND_TO_RUN%
-        call %COMMAND_TO_RUN% || EXIT /B 1
+        call %COMMAND_TO_RUN% || EXIT 1
     )
 ) ELSE (
     ECHO Using default MSVC build environment for 32 bit architecture
     ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT /B 1
+    call %COMMAND_TO_RUN% || EXIT 1
 )

ci/conda/build.sh

@@ -27,7 +27,7 @@ cmake -G Ninja -DCMAKE_INSTALL_PREFIX=$PREFIX \
 if [ `uname` == Darwin ]; then
 ninja
 else
-ninja -j 3
+ninja -j 6
 fi
 
 # Install step

ci/conda/fix_GeomFill_BSplineCurves_Init_method.patch

@@ -7,7 +7,6 @@ source:
   path: ../..
   patches:
     - fix_graphicshr_location.patch [win]
-    - fix_GeomFill_BSplineCurves_Init_method.patch
 
 build:
   script_env:
@@ -25,24 +24,26 @@ requirements:
   build:
     - patch             [win]
     - python
-    - oce ==0.17.2
+    - oce ==0.17.3
     - cmake
     - ninja
     - swig
     - freetype
     - gcc               [linux]
+
   run:
-    - pyqt
-    - wxpython          [py27]
-    - pyside            [py27]
-    - oce ==0.17.2
+    - pyqt >=5
+    - oce ==0.17.3
     - python
     - freetype
     - pyobjc-core       [osx and py27]
 
 test:
   requires:
     - scipy
+    - wxpython          [py27]
+    - pyside            [py27]
+
 about:
   home: https://github.com/tpaviot/pythonocc-core
   license: LGPL