Skip to content

Commit

Permalink
MNT: Re-rendered with conda-smithy 1.7.0.post.dev10
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed Jan 4, 2017
1 parent 672f898 commit 05d0a6c
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 27 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
* text=auto

meta.yaml text eol=lf
build.sh text eol=lf
bld.bat text eol=crlf
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ env:
- 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: "WlS30bguSk8YOUDLjRNiXla20H5RHEjjt74bk6W4/f6QvpojR0AeytKGC5ADMsA93uxK7lAzHs6K0Te+x8chYHe2QDFrPCYhJGI1hpUbLIUz18EvvSOxHwMMNvnT8tR4WJ4eG2HPnciUKNj6/tWUd0eiLRiSPuhjVHMncBp+dRymJn1fTj/EdRh4k3b9ysFr8jH1FCaMMGFm9LJvEffl84dMVfE8JJ02BdOapQySTS81pOoOqY7ILldd4Qtyh6POD1EMmQvFdoEfYMBckS8nlSF5hNVzgGsWbNPz2wSIWNDtKH6qfB4xkmpcvrDeh7RZm/7TQKOpuR8W+r5pQg7iC3z6kQmxTFD6VIs4BdhcBKaVj7zm6OQRcnLsbZVExXxIIO6dSecbCUDsn/r9hiY1gVyVIFfN7kdg9LDde4y6k2fxusLdvz5xpWNL1tPFEWpWGxZLaoK7ool6IiTSbBm3Sf9k3AXLZgcICKiuWl5A9LFxqpt7IjY1A5/FTULhb7i+9dXDMee/KFhvEyuRnRMX8yWLhMTnMSoVkgOFCfDWYJsFUa9xfsMZB9aLWHgxt/MFPQHoWpWAy8dUeI9My3CvOsZxo72YGEf6qOyoO+d8iNbHtWXSquI3B96SarZTS22RUevsa1qpUkAK2KZ2lK4tXVg6KHGbH0qnG2yoTtYGS5A="
Expand All @@ -31,6 +32,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
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ Summary: library with cross-python path, ini-parsing, io, code, log facilities



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

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

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

Installing py
=============

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

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


Updating py-feedstock
=====================
Expand Down
30 changes: 17 additions & 13 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ environment:
# 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"
CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"

BINSTAR_TOKEN:
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC
Expand Down Expand Up @@ -43,6 +38,14 @@ environment:
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64

- TARGET_ARCH: x86
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda

- TARGET_ARCH: x64
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda-x64


# We always use a 64-bit machine, but can build x86 distributions
# with the TARGET_ARCH variable.
Expand All @@ -63,23 +66,24 @@ 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 our channels.
# Add a hack to update conda as the included copy is too old.
- 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 --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: conda update --yes --quiet conda
- cmd: set "PATH=%OLDPATH%"
- cmd: set "OLDPATH="

# Actually activate `conda`.
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- cmd: set PYTHONUNBUFFERED=1

# Add our channels.
- 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

# 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
Expand Down
10 changes: 8 additions & 2 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -41,7 +41,7 @@ conda clean --lock
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup
# Embarking on 3 case(s).
# Embarking on 4 case(s).
set -x
export CONDA_PY=27
set +x
Expand All @@ -59,4 +59,10 @@ 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_PY=36
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
EOF

0 comments on commit 05d0a6c

Please sign in to comment.