Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump to version 0.4.2 #5

Merged
merged 3 commits into from
Aug 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ install:
bash $MINICONDA_FILE -b

export PATH=/Users/travis/miniconda3/bin:$PATH

conda config --set show_channel_urls true
conda update --yes conda
conda install --yes conda-build=1.20.0 jinja2 anaconda-client
conda config --add channels conda-forge

conda config --set show_channel_urls true
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup

script:
- conda build ./recipe
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ About conda-forge

conda-forge is a community-led conda channel of installable packages.
In order to provide high-quality builds, the process has been automated into the
conda-forge GitHub organization. The conda-forge organization contains one repository
conda-forge GitHub organization. The conda-forge organization contains one repository
for each of the installable packages. Such a repository is known as a *feedstock*.

A feedstock is made up of a conda recipe (the instructions on what and how to build
Expand Down Expand Up @@ -71,7 +71,7 @@ Current build status
====================

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

Current release info
Expand All @@ -92,7 +92,7 @@ install and use.

In order to produce a uniquely identifiable distribution:
* If the version of a package **is not** being increased, please add or increase
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
* If the version of a package **is** being increased, please remember to return
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
back to 0.
12 changes: 4 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file was automatically generated by conda-smithy. To update a component of this
# file, make changes to conda-forge.yaml and/or recipe/meta.yaml, and run
# "conda-smithy regenerate".
# "conda smithy rerender".

environment:

Expand Down Expand Up @@ -58,18 +58,14 @@ install:
- 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: set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- cmd: set PYTHONUNBUFFERED=1

- 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
- cmd: conda info
- cmd: conda install -n root --quiet --yes conda-build anaconda-client jinja2 setuptools
# Workaround for Python 3.4 and x64 bug in latest conda-build.
# FIXME: Remove once there is a release that fixes the upstream issue
# ( https://github.com/conda/conda-build/issues/895 ).
- cmd: if "%TARGET_ARCH%" == "x64" if "%CONDA_PY%" == "34" conda install conda-build=1.20.0 --yes
- 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
Expand Down
6 changes: 2 additions & 4 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ config=$(cat <<CONDARC

channels:
- conda-forge

- defaults # As we need conda-build

conda-build:
Expand All @@ -39,9 +38,8 @@ echo "$config" > ~/.condarc
# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts.
conda clean --lock

conda update --yes --all
conda install --yes conda-build
conda info
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup

# Embarking on 3 case(s).
set -x
Expand Down
6 changes: 3 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "0.4.1" %}
{% set version = "0.4.2" %}

package:
name: vega
Expand All @@ -7,10 +7,10 @@ package:
source:
fn: vega-{{ version }}.tar.gz
url: https://pypi.io/packages/source/v/vega/vega-{{ version }}.tar.gz
md5: 9cc2c953e7076eb6d7ab534f05d59219
md5: 1b5ba6ce77d4c240f6dde55cb8df5dd9

build:
number: 2
number: 0
script: python setup.py install --single-version-externally-managed --record=record.txt

requirements:
Expand Down