Skip to content

Commit

Permalink
MNT: Updated the feedstock for conda-smithy version 1.7.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
conda-forge-admin authored and u34246 committed Dec 23, 2016
1 parent 8c71353 commit 0faaa9b
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 25 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
@@ -0,0 +1,5 @@
* text=auto

meta.yaml text eol=lf
build.sh text eol=lf
bld.bat text eol=crlf
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -25,9 +25,9 @@ before_install:

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
Expand Down
25 changes: 12 additions & 13 deletions README.md
Expand Up @@ -11,6 +11,18 @@ Summary: Python library for working with CouchDB



Current build status
====================

Linux: [![Circle CI](https://circleci.com/gh/conda-forge/python-couchdb-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/python-couchdb-feedstock)
OSX: [![TravisCI](https://travis-ci.org/conda-forge/python-couchdb-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/python-couchdb-feedstock)
Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/python-couchdb-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/python-couchdb-feedstock/branch/master)

Current release info
====================
Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/python-couchdb/badges/version.svg)](https://anaconda.org/conda-forge/python-couchdb)
Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/python-couchdb/badges/downloads.svg)](https://anaconda.org/conda-forge/python-couchdb)

Installing python-couchdb
=========================

Expand All @@ -33,7 +45,6 @@ conda search python-couchdb --channel conda-forge
```



About conda-forge
=================

Expand Down Expand Up @@ -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/python-couchdb-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/python-couchdb-feedstock)
OSX: [![TravisCI](https://travis-ci.org/conda-forge/python-couchdb-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/python-couchdb-feedstock)
Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/python-couchdb-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/python-couchdb-feedstock/branch/master)

Current release info
====================
Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/python-couchdb/badges/version.svg)](https://anaconda.org/conda-forge/python-couchdb)
Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/python-couchdb/badges/downloads.svg)](https://anaconda.org/conda-forge/python-couchdb)


Updating python-couchdb-feedstock
=================================
Expand Down
32 changes: 22 additions & 10 deletions appveyor.yml
Expand Up @@ -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_INSTALL_LOCN: C:\\Miniconda3

- TARGET_ARCH: x64
CONDA_PY: 34
CONDA_INSTALL_LOCN: C:\\Miniconda3-x64

- TARGET_ARCH: x86
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35

- TARGET_ARCH: x64
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64


# We always use a 64-bit machine, but can build x86 distributions
Expand All @@ -56,14 +57,25 @@ 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
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- 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 install -c pelson/channel/development --yes --quiet obvious-ci
- 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

- 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

Expand Down

0 comments on commit 0faaa9b

Please sign in to comment.