Merge pull request #13 from ocefpaf/py36

rerender with auto

.gitattributes

@@ -0,0 +1,5 @@
+* text=auto
+
+meta.yaml text eol=lf
+build.sh text eol=lf
+bld.bat text eol=crlf

.travis.yml

@@ -4,33 +4,35 @@
 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: "p51QLZyDDyG61t7dpOLmt65r5PVTYMTAOeYZ4bTQ1NUOmiXsu61aCUIonR4eZTc+npXSJTXlPJh4ZBDN2E0h0TCT3Qwz6af7NykdnC8sLeuRNbbFl/Z9OuG8ZqRZrFmcSw0DhAE5SZCQlT/iPOzqvfY9UxfwM8aWJkvwlSm47GcFrQZKpLkbDffLCSCKEN7ann6B+HADEn8ClWaHZz50A/jj6H31ZaYJyXAIX5jG2Y1weeIfV80oF1JaIk6wa65c9L2A02g/QZi4Z1ndcUnD3CL9UugasYuiWw2O82SuAVbjBnPJ07B19uam5wN+PBYgVKfjDo9WVqEyu8lHjHsUzsZEUcINSsonuvstxexD3fcmd11G3VI4JD19uneA41hLjtja6zGh+FThxHkkxG3//woida0eUvgg9fub2KABkz2y1yhadhXHXF7Z8QvQ9wLiFlAWy2yjmPivqZm/a1hEbvRfzebRdR08YjFW6JzWe+KEUFKWvGL27Pqz9hIGSRWlxNte14NPW+0+7BIe4GqXg7YEMjZcfigatZ2/YXZNgy+tU7rgMfk9i50oFJGMbFxDxJbPu9DPMfDAdFjxNamcxwuAs+wkrExzr1grKtxiHgquD5jo6bbjn5ECTQmxDYVAwuyInxOQJRMvzUcO0BRuePFQVyxsB8P3c5KWMIuu4Gk="
 
 
 before_install:
     # Remove homebrew.
-    - brew remove --force $(brew list)
+    - brew remove --force --ignore-dependencies $(brew list)
     - brew cleanup -s
     - rm -rf $(brew --cache)
 
 install:
     - |
-      MINICONDA_URL="http://repo.continuum.io/miniconda"
+      MINICONDA_URL="https://repo.continuum.io/miniconda"
       MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh"
-      curl -O "${MINICONDA_URL}/${MINICONDA_FILE}"
+      curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}"
       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

README.md

@@ -11,6 +11,18 @@ Summary: Launch Jupyter kernels for any installed conda environment
 
 
 
+Current build status
+====================
+
+Linux: [![Circle CI](https://circleci.com/gh/conda-forge/nb_conda_kernels-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/nb_conda_kernels-feedstock)
+OSX: [![TravisCI](https://travis-ci.org/conda-forge/nb_conda_kernels-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/nb_conda_kernels-feedstock)
+Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/nb_conda_kernels-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/nb-conda-kernels-feedstock/branch/master)
+
+Current release info
+====================
+Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/nb_conda_kernels/badges/version.svg)](https://anaconda.org/conda-forge/nb_conda_kernels)
+Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/nb_conda_kernels/badges/downloads.svg)](https://anaconda.org/conda-forge/nb_conda_kernels)
+
 Installing nb_conda_kernels
 ===========================
 
@@ -33,7 +45,6 @@ conda search nb_conda_kernels --channel conda-forge
 ```
 
 
-
 About conda-forge
 =================
 
@@ -68,18 +79,6 @@ Terminology
 **conda-forge** - the place where the feedstock and smithy live and work to
                   produce the finished article (built conda distributions)
 
-Current build status
-====================
-
-Linux: [![Circle CI](https://circleci.com/gh/conda-forge/nb_conda_kernels-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/nb_conda_kernels-feedstock)
-OSX: [![TravisCI](https://travis-ci.org/conda-forge/nb_conda_kernels-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/nb_conda_kernels-feedstock)
-Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/nb_conda_kernels-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/nb-conda-kernels-feedstock/branch/master)
-
-Current release info
-====================
-Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/nb_conda_kernels/badges/version.svg)](https://anaconda.org/conda-forge/nb_conda_kernels)
-Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/nb_conda_kernels/badges/downloads.svg)](https://anaconda.org/conda-forge/nb_conda_kernels)
-
 
 Updating nb_conda_kernels-feedstock
 ===================================

appveyor.yml

@@ -4,38 +4,39 @@
 
 environment:
 
-  CONDA_INSTALL_LOCN: "C:\\conda"
-
   # 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"
 
-  # We set a default Python version for the miniconda that is to be installed. This can be
-  # overridden in the matrix definition where appropriate.
-  CONDA_PY: "27"
   BINSTAR_TOKEN:
     # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
     secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC
 
   matrix:
     - TARGET_ARCH: x86
       CONDA_PY: 27
+      CONDA_INSTALL_LOCN: C:\\Miniconda
 
     - TARGET_ARCH: x64
       CONDA_PY: 27
+      CONDA_INSTALL_LOCN: C:\\Miniconda-x64
 
     - TARGET_ARCH: x86
-      CONDA_PY: 34
+      CONDA_PY: 35
+      CONDA_INSTALL_LOCN: C:\\Miniconda35
 
     - TARGET_ARCH: x64
-      CONDA_PY: 34
+      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
 
 
 # We always use a 64-bit machine, but can build x86 distributions
@@ -56,14 +57,21 @@ install:
 
     # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.)
     - cmd: rmdir C:\cygwin /s /q
-    - appveyor DownloadFile "https://raw.githubusercontent.com/pelson/Obvious-CI/master/bootstrap-obvious-ci-and-miniconda.py"
-    - cmd: python bootstrap-obvious-ci-and-miniconda.py %CONDA_INSTALL_LOCN% %TARGET_ARCH% %CONDA_PY:~0,1% --without-obvci
+
+    # 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: conda config --set show_channel_urls true
-    - cmd: conda install -c pelson/channel/development --yes --quiet obvious-ci
+    - cmd: conda config --remove channels defaults
+    - cmd: conda config --add channels defaults
     - 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
 

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 $?
@@ -57,13 +57,13 @@ yum install -y fontconfig
     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

recipe/meta.yaml

@@ -25,6 +25,9 @@ requirements:
     - python
 
 test:
+test:
+  source_files:
+    - nb_conda_kernels
   requires:
     - coverage
     - flake8
@@ -39,9 +42,11 @@ test:
 
 about:
   home: https://github.com/{{ gh_org }}/{{ gh_repo }}
-  license: BSD-3-Clause
-  summary: Launch Jupyter kernels for any installed conda environment
+  license: BSD 3-Clause
+  license_file: LICENSE
+  summary: 'Launch Jupyter kernels for any installed conda environment.'
 
 extra:
   recipe-maintainers:
     - bollwyvl
+    - ocefpaf