Merge pull request conda-forge#24 from jakirkham/use_np_113

Add NumPy 1.13

.travis.yml

@@ -11,10 +11,13 @@ env:
 
     - CONDA_NPY=111  CONDA_PY=27
     - CONDA_NPY=112  CONDA_PY=27
+    - CONDA_NPY=113  CONDA_PY=27
     - CONDA_NPY=111  CONDA_PY=35
     - CONDA_NPY=112  CONDA_PY=35
+    - CONDA_NPY=113  CONDA_PY=35
     - CONDA_NPY=111  CONDA_PY=36
     - CONDA_NPY=112  CONDA_PY=36
+    - CONDA_NPY=113  CONDA_PY=36
   global:
     # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
     - secure: "q48hR6+qKPtY90GdtVp1vtn19NX9ogYcN9PHgsDGjgPRw0uvc7wvoaC/l9Kdqn3kXFclq0pQsX4k4F3nKANBdu6eVU4UImovkSAlp8Og9m0u1hQkPkhNnwV6INLlPWXxgUqCrQkfwtbCDbmytwjU0YeTZpEH5VdlTSROvYiuNCXD06AgNG/3AuP8ooO57Gabv110OHe1zJM5tUds7rIglLUSE9HyvjbtfZN+6H9px9+8E5NOA82+9Ps0ax46dD+frSgEh1Ka+GolB8qOOxgZR3eGdf6IkneV5WF6ax3PyXrJcoR+TlapDJchxX2BWnxG8Ae3YLY8Nk7hawfnJJ33I0akJOZCNBcIEcY2JoKJwTfXdzyj6sH2Lu39oO6/MRQ+RJuM2Tf4mxBZqz+kjH9ncDjJV0xiwZPDDKM0liQ+MbwgvtJFbc7k2Hmxxoc6ZjP9IqRBAkbFjdN9BroE0XP19wcCLQ55YAIxcRY+IvqWtYE5rtb2QJSEMDiZu5id+bmpf8yV/ZJ7C8yn3l6c+T+tnspJNCq5bAfTNv1gVc+yTKonX3GK1k+DVuNabPWiz/GPM+Q67FEKDd7e6j6Y0bcr9JHh4adXK0589ZilA5gs3ACEdQdiRBVE7C3ATNyC04oV1nh9BOR4eYJGXVA8lv6F3xS7/mmDHTIdBZx5ws6s9eo="

appveyor.yml

@@ -4,11 +4,6 @@
 
 environment:
 
-  # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
-  # /E:ON and /V:ON options are not enabled in the batch script intepreter
-  # See: http://stackoverflow.com/a/13751649/163740
-  CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd"
-
   BINSTAR_TOKEN:
     # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
     secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC
@@ -34,6 +29,16 @@ environment:
       CONDA_PY: 27
       CONDA_INSTALL_LOCN: C:\\Miniconda-x64
 
+    - TARGET_ARCH: x86
+      CONDA_NPY: 113
+      CONDA_PY: 27
+      CONDA_INSTALL_LOCN: C:\\Miniconda
+
+    - TARGET_ARCH: x64
+      CONDA_NPY: 113
+      CONDA_PY: 27
+      CONDA_INSTALL_LOCN: C:\\Miniconda-x64
+
     - TARGET_ARCH: x86
       CONDA_NPY: 111
       CONDA_PY: 35
@@ -54,6 +59,16 @@ environment:
       CONDA_PY: 35
       CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
 
+    - TARGET_ARCH: x86
+      CONDA_NPY: 113
+      CONDA_PY: 35
+      CONDA_INSTALL_LOCN: C:\\Miniconda35
+
+    - TARGET_ARCH: x64
+      CONDA_NPY: 113
+      CONDA_PY: 35
+      CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
+
     - TARGET_ARCH: x86
       CONDA_NPY: 111
       CONDA_PY: 36
@@ -74,6 +89,16 @@ environment:
       CONDA_PY: 36
       CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
 
+    - TARGET_ARCH: x86
+      CONDA_NPY: 113
+      CONDA_PY: 36
+      CONDA_INSTALL_LOCN: C:\\Miniconda36
+
+    - TARGET_ARCH: x64
+      CONDA_NPY: 113
+      CONDA_PY: 36
+      CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
+
 
 # We always use a 64-bit machine, but can build x86 distributions
 # with the TARGET_ARCH variable.
@@ -103,14 +128,13 @@ install:
     - cmd: conda config --add channels conda-forge
 
     # Configure the VM.
-    - cmd: conda install -n root --quiet --yes obvious-ci
     - cmd: conda install -n root --quiet --yes conda-forge-build-setup
     - cmd: run_conda_forge_build_setup
 
 # Skip .NET project specific build phase.
 build: off
 
 test_script:
-    - "%CMD_IN_ENV% conda build recipe --quiet"
+    - conda build recipe --quiet
 deploy_script:
     - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main

ci_support/run_docker_build.sh

@@ -24,16 +24,30 @@ show_channel_urls: true
 CONDARC
 )
 
+# In order for the conda-build process in the container to write to the mounted
+# volumes, we need to run with the same id as the host machine, which is
+# normally the owner of the mounted volumes, or at least has write permission
+HOST_USER_ID=$(id -u)
+# Check if docker-machine is being used (normally on OSX) and get the uid from
+# the VM
+if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then
+    HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
+fi
+
 rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done"
 
 cat << EOF | docker run -i \
                         -v "${RECIPE_ROOT}":/recipe_root \
                         -v "${FEEDSTOCK_ROOT}":/feedstock_root \
+                        -e HOST_USER_ID="${HOST_USER_ID}" \
                         -a stdin -a stdout -a stderr \
                         condaforge/linux-anvil \
                         bash || exit 1
 
+set -e
+set +x
 export BINSTAR_TOKEN=${BINSTAR_TOKEN}
+set -x
 export PYTHONUNBUFFERED=1
 
 echo "$config" > ~/.condarc
@@ -43,7 +57,7 @@ conda clean --lock
 conda install --yes --quiet conda-forge-build-setup
 source run_conda_forge_build_setup
 
-# Embarking on 6 case(s).
+# Embarking on 9 case(s).
     set -x
     export CONDA_NPY=111
     export CONDA_PY=27
@@ -58,6 +72,13 @@ source run_conda_forge_build_setup
     conda build /recipe_root --quiet || exit 1
     upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
 
+    set -x
+    export CONDA_NPY=113
+    export CONDA_PY=27
+    set +x
+    conda build /recipe_root --quiet || exit 1
+    upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
+
     set -x
     export CONDA_NPY=111
     export CONDA_PY=35
@@ -72,6 +93,13 @@ source run_conda_forge_build_setup
     conda build /recipe_root --quiet || exit 1
     upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
 
+    set -x
+    export CONDA_NPY=113
+    export CONDA_PY=35
+    set +x
+    conda build /recipe_root --quiet || exit 1
+    upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
+
     set -x
     export CONDA_NPY=111
     export CONDA_PY=36
@@ -85,6 +113,13 @@ source run_conda_forge_build_setup
     set +x
     conda build /recipe_root --quiet || exit 1
     upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
+
+    set -x
+    export CONDA_NPY=113
+    export CONDA_PY=36
+    set +x
+    conda build /recipe_root --quiet || exit 1
+    upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
 touch /feedstock_root/build_artefacts/conda-forge-build-done
 EOF