Merge pull request #7 from conda-forge-admin/feedstock_rerender_master

MNT: Re-render the feedstock
conda-forge · Feb 21, 2017 · 032c552 · 032c552
2 parents dad5ff0 + 29dcbe2
commit 032c552
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,22 +4,22 @@
 language: generic
 
 os: osx
-osx_image: beta-xcode6.1
+osx_image: xcode6.4
 
 env:
   matrix:
 
     - CONDA_PY=27
-    - CONDA_PY=34
     - CONDA_PY=35
+    - CONDA_PY=36
   global:
     # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
     - secure: "C1zNii905zzFJWubXHYNgYgJpd/eUjeupgXxqKCHD1GD2G6GyEjdpZSP/TNx2WpKQ7Ap2B4uTd4VewyvQhrBzkjAIGnDMdZeM0l3eHV/bSk9f+LI7cBe3S2y1/imhUGKlIR0hbbMCscVxADep1h0mku/VR0bnFJYwhrv2fyI1HQR48Yrgv8yc3wcowRcmmViPdiUq1HPjt/X641iM5xBXyZuEooowyeSAsn6euKzgFyuixjdNGZDiVD16ar6fRLwNGBNEtCdqmSO9+2JzYyLOTKf5Zw9+2lBBpX58jrM8Z2rt2U/cpg9uEosZd8Bc0Nba/mFWZ1wgs0DXcb3px/zIBS1NRh07IPMibpHvE4HitRiYc0rM02l1DKPtlIWPXZtI/vZE6XlqkLm1PgHVlG2byCAN1IpxAarFrB7RYcvO1gvN3Y7DVGadMASeptMrQabIBl4F5grfjj9jhHUeMs1HW7XP6dKfvYPosW99f9UH/JG6nejj+m6d/BZV2tA56FNSXMRiL4Pny5v+xwYv6RF2moE+f/Zn+a3u2xhqMYJ+IB/tenlPMoAUB0QzOU2dtfwnJWQRkTcW/wZ9W0I0Nw52KhU7kBqyxodcncDTyLw6HBOwk+E17c3pPo+iLibubfrOAb8/QvkSa/d6M1kSevkLdv7sxgRiKVnOPXdWbkdPh0="
 
 
 before_install:
     # Remove homebrew.
-    - brew remove --force $(brew list)
+    - brew remove --force --ignore-dependencies $(brew list)
     - brew cleanup -s
     - rm -rf $(brew --cache)
 
@@ -31,6 +31,8 @@ install:
       bash $MINICONDA_FILE -b
 
       source /Users/travis/miniconda3/bin/activate root
+      conda config --remove channels defaults
+      conda config --add channels defaults
       conda config --add channels conda-forge
       conda config --set show_channel_urls true
       conda install --yes --quiet conda-forge-build-setup

diff --git a/appveyor.yml b/appveyor.yml
@@ -23,19 +23,19 @@ environment:
       CONDA_INSTALL_LOCN: C:\\Miniconda-x64
 
     - TARGET_ARCH: x86
-      CONDA_PY: 34
-      CONDA_INSTALL_LOCN: C:\\Miniconda3
+      CONDA_PY: 35
+      CONDA_INSTALL_LOCN: C:\\Miniconda35
 
     - TARGET_ARCH: x64
-      CONDA_PY: 34
-      CONDA_INSTALL_LOCN: C:\\Miniconda3-x64
+      CONDA_PY: 35
+      CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
 
     - TARGET_ARCH: x86
-      CONDA_PY: 35
+      CONDA_PY: 36
       CONDA_INSTALL_LOCN: C:\\Miniconda35
 
     - TARGET_ARCH: x64
-      CONDA_PY: 35
+      CONDA_PY: 36
       CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
 
 
@@ -58,23 +58,19 @@ install:
     # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.)
     - cmd: rmdir C:\cygwin /s /q
 
+    # Add path, activate `conda` and update conda.
+    - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+    - cmd: conda update --yes --quiet conda
+
+    - cmd: set PYTHONUNBUFFERED=1
+
     # Add our channels.
-    - cmd: set "OLDPATH=%PATH%"
-    - cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%"
     - cmd: conda config --set show_channel_urls true
+    - cmd: conda config --remove channels defaults
+    - cmd: conda config --add channels defaults
     - cmd: conda config --add channels conda-forge
 
-    # Add a hack to switch to `conda` version `4.1.12` before activating.
-    # This is required to handle a long path activation issue.
-    # Please see PR ( https://github.com/conda/conda/pull/3349 ).
-    - cmd: conda install --yes --quiet conda=4.1.12
-    - cmd: set "PATH=%OLDPATH%"
-    - cmd: set "OLDPATH="
-
-    # Actually activate `conda`.
-    - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-    - cmd: set PYTHONUNBUFFERED=1
-
+    # 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

diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh
@@ -14,7 +14,7 @@ config=$(cat <<CONDARC
 
 channels:
  - conda-forge
- - defaults # As we need conda-build
+ - defaults
 
 conda-build:
  root-dir: /feedstock_root/build_artefacts
@@ -25,8 +25,8 @@ CONDARC
 )
 
 cat << EOF | docker run -i \
-                        -v ${RECIPE_ROOT}:/recipe_root \
-                        -v ${FEEDSTOCK_ROOT}:/feedstock_root \
+                        -v "${RECIPE_ROOT}":/recipe_root \
+                        -v "${FEEDSTOCK_ROOT}":/feedstock_root \
                         -a stdin -a stdout -a stderr \
                         condaforge/linux-anvil \
                         bash || exit $?
@@ -49,13 +49,13 @@ source run_conda_forge_build_setup
     upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
 
     set -x
-    export CONDA_PY=34
+    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_PY=35
+    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