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

Make boost compatible with anaconda=4.2.0 #15

Closed
wants to merge 3 commits into from
Closed
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
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# This file was generated automatically from conda-smithy. To update this configuration,
# update the conda-forge.yaml and/or the recipe/meta.yaml.

language: objective-c
language: generic

os: osx

env:
matrix:
Expand All @@ -28,16 +30,12 @@ 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

after_success:

- ./ci_support/upload_or_check_non_existence.py ./recipe conda-forge --channel=main
25 changes: 15 additions & 10 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 @@ -70,8 +70,8 @@ Terminology
Current build status
====================

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

Current release info
Expand All @@ -83,16 +83,21 @@ Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/boost/badg
Updating boost-feedstock
========================

If you would like to improve the boost recipe, please take the normal
route of forking this repository and submitting a PR. Upon submission, your changes will
be run on the appropriate platforms to give the reviewer an opportunity to confirm that the
changes result in a successful build. Once merged, the recipe will be re-built and uploaded
automatically to the conda-forge channel, whereupon they will be available for everybody to
install and use.
If you would like to improve the boost recipe or build a new
package version, please fork this repository and submit a PR. Upon submission,
your changes will be run on the appropriate platforms to give the reviewer an
opportunity to confirm that the changes result in a successful build. Once
merged, the recipe will be re-built and uploaded automatically to the
`conda-forge` channel, whereupon the built conda packages will be available for
everybody to install and use from the `conda-forge` channel.
Note that all branches in the conda-forge/boost-feedstock are
immediately built and any created packages are uploaded, so PRs should be based
on branches in forks and branches in the main repository should only be used to
build distinct package versions.

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
11 changes: 7 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% set version = "1.61.0" %}
{% set filename = "boost_%s.tar.bz2" % version.replace(".", "_") %}
{% set build_number = "0" %}

package:
name: boost
Expand All @@ -11,22 +12,23 @@ source:
md5: 6095876341956f65f9d35939ccea1a9f

build:
number: 2
number: {{ build_number }}
features:
- vc9 # [win and py27]
- vc10 # [win and py34]
- vc14 # [win and py35]
string: icu54py{{ CONDA_PY }}_{{ build_number }}

requirements:
build:
- python
- icu 56.* # [unix]
- bzip2 1.0.* # [unix]
- icu 54.* # [unix]
- bzip2 # [unix]
- zlib 1.2.*

run:
- python
- icu 56.* # [unix]
- icu 54.* # [unix]
- zlib 1.2.*

test:
Expand Down Expand Up @@ -101,3 +103,4 @@ extra:
- jakirkham
- msarahan
- ocefpaf
- 183amir