Skip to content

Commit

Permalink
MNT: Re-rendered with conda-smithy 3.1.4 and pinning 2018.05.22
Browse files Browse the repository at this point in the history
  • Loading branch information
conda-forge-admin committed May 24, 2018
1 parent f6e5360 commit 49b7a32
Show file tree
Hide file tree
Showing 18 changed files with 191 additions and 106 deletions.
17 changes: 6 additions & 11 deletions appveyor.yml → .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ environment:
secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4

matrix:
- TARGET_ARCH: x86
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda36

- TARGET_ARCH: x64
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
- CONFIG: win_python3.6
CONDA_INSTALL_LOCN: C:\Miniconda36-x64


# We always use a 64-bit machine, but can build x86 distributions
Expand All @@ -26,7 +21,7 @@ platform:
install:
# If there is a newer build queued for the same PR, cancel this one.
- cmd: |
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
del ff_ci_pr_build.py
Expand All @@ -46,13 +41,13 @@ install:
- cmd: conda.exe config --add channels conda-forge

# Configure the VM.
- cmd: conda.exe install -n root --quiet --yes conda-forge-build-setup
- cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1
- cmd: run_conda_forge_build_setup

# Skip .NET project specific build phase.
build: off

test_script:
- conda.exe build recipe --quiet
- conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
deploy_script:
- cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main
- cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml
1 change: 1 addition & 0 deletions .ci_support/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly.
6 changes: 6 additions & 0 deletions .ci_support/linux_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
12 changes: 12 additions & 0 deletions .ci_support/osx_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
6 changes: 6 additions & 0 deletions .ci_support/win_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
33 changes: 33 additions & 0 deletions .circleci/build_steps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/env bash

# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here
# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent
# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also
# benefit from the improvement.

set -xeuo pipefail
export PYTHONUNBUFFERED=1

cat >~/.condarc <<CONDARC
channels:
- conda-forge
- defaults
conda-build:
root-dir: /home/conda/feedstock_root/build_artifacts
show_channel_urls: true
CONDARC

# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
conda clean --lock

conda install --yes --quiet conda-forge-ci-setup=1 conda-build
source run_conda_forge_build_setup

conda build /home/conda/recipe_root -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml --quiet
upload_or_check_non_existence /home/conda/recipe_root conda-forge --channel=main -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml

touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}"
File renamed without changes.
16 changes: 6 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,26 @@
version: 2

jobs:
build__CONDA_PY_36:
build_linux_python3.6:
working_directory: ~/test
machine: true
environment:
- CONDA_PY: "36"
- CONFIG: "linux_python3.6"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
./.circleci/fast_finish_ci_pr_build.sh
./.circleci/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
command: ./.circleci/run_docker_build.sh

workflows:
version: 2
build_and_test:
jobs:
- build__CONDA_PY_36
- build_linux_python3.6
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}"
47 changes: 47 additions & 0 deletions .circleci/run_docker_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#!/usr/bin/env bash

# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here
# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent
# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also
# benefit from the improvement.

set -xeuo pipefail

FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;)
RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe

docker info

# In order for the conda-build process in the container to write to the mounted
# volumes, we need to run with the same id as the host machine, which is
# normally the owner of the mounted volumes, or at least has write permission
export HOST_USER_ID=$(id -u)
# Check if docker-machine is being used (normally on OSX) and get the uid from
# the VM
if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then
export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
fi

ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"

if [ -z "$CONFIG" ]; then
echo "Need to set CONFIG env variable"
exit 1
fi

test -d "$ARTIFACTS" || mkdir "$ARTIFACTS"
DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"
rm -f "$DONE_CANARY"

docker run -it \
-v "${RECIPE_ROOT}":/home/conda/recipe_root \
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \
-e CONFIG \
-e BINSTAR_TOKEN \
-e HOST_USER_ID \
condaforge/linux-anvil \
bash \
/home/conda/feedstock_root/.circleci/build_steps.sh

# verify that the end of the script was reached
test -f "$DONE_CANARY"
15 changes: 15 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Thanks for your interest in helping out conda-forge.

Whether you are brand new or a seasoned maintainer, we always appreciate
feedback from the community about how we can improve conda-forge. If you
are submitting a PR or issue, please fill out the respective template. Should
any questions arise please feel free to ask the maintainer team of the
respective feedstock or reach out to `@conda-forge/core` for more complex
issues.

In the case of any issues reported, please be sure to demonstrate the relevant
issue (even if it is an absence of a feature). Providing this information will
help busy maintainers understand what it is you hope to accomplish. Also this
will help provide them clues as to what might be going wrong. These examples
can also be reused as tests in the build to ensure further packages meet these
criteria. This is requested to help you get timely and relevant feedback. :)
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!--
Thanks for reporting your issue.
Please fill out the sections below.
-->
Issue:

<br/>
Environment (<code>conda list</code>):
<details>

```
$ conda list
```
</details>

<br/>
Details about <code>conda</code> and system ( <code>conda info</code> ):
<details>

```
$ conda info
```
</details>
18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!--
Thank you for pull request.
Below are a few things we ask you kindly to self-check before getting a review. Remove checks that are not relevant.
-->
Checklist
* [ ] Used a fork of the feedstock to propose changes
* [ ] Bumped the build number (if the version is unchanged)
* [ ] Reset the build number to `0` (if the version changed)
* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy`
* [ ] Ensured the license file is being packaged.

<!--
Please note any issues this fixes using [closing keywords]( https://help.github.com/articles/closing-issues-using-keywords/ ):
-->

<!--
Please add any other relevant info below:
-->
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*.pyc

build_artefacts
build_artifacts
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ osx_image: xcode6.4

env:
matrix:

- CONDA_PY=36
- CONFIG=osx_python3.6

global:
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
- secure: "nQvapS6BnScLKFkR2kKHu5+DgOgDE0ZphhIypcq+cCR9CsvQgTRnXZ6UHzz4A9KthQ1xNJdFlfopYtF+tf8z+Ec7kxayAWOwuZFjUtat6R4eXqgtTCxU0MEuZQ/LMURa3UsPcbfUK/wxQl/vskNX6dR95itjvjW/zuzFojUYGTqOEvt5Oa13HxdWJuDW/T6g7kzA5VnePRllWC4J84Hbxs3IYPZhcHUVXNAX2HatdKAgMgT6cUeAAtIbVHTUdjbBTP+0M28G3492U5hSBRqB6KBkyopaSu7RkFTE/q1LNxvYAraGgNAnyUNLgW7tMEf5hUKUavSH4xGPWjeGULpBALtdk/ThPFJvehfw+fZ7uSCTuaIyUDiH4J5EGu/k09NveBvMxcJngwn+y73WTaDs22qVmmSmbh2itghXIi/qZvMqWznlYfYzqjDllRc7BAhx2vGkDDYnCUr7f9EQOymaKvcJlV24zH8l1oDtmW73K3QEjUodt7MjGb+pQNTooy5T6QmJLVWTEBZw78VE3PWw07BlWZg0jcnLAr2nLRfWxP9rGmn5TlhJnZC/jT7htFOEncrs7CRD0kya+qgGMkvffD1KmopW6Kt+7Ytka4+uUF7C7CmW7yoAbJDl24VjQrU64d9ZULXWSBKjRM8XOpVAERSulVF97lz4qeQcyE3TJUs="
Expand All @@ -18,7 +18,7 @@ env:
before_install:
# Fast finish the PR.
- |
(curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
(curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1
# Remove homebrew.
Expand Down Expand Up @@ -50,10 +50,10 @@ install:
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
conda install --yes --quiet conda-forge-ci-setup=1
source run_conda_forge_build_setup
script:
- conda build ./recipe
- conda build ./recipe -m ./.ci_support/${CONFIG}.yaml

- upload_or_check_non_existence ./recipe conda-forge --channel=main
- upload_or_check_non_existence ./recipe conda-forge --channel=main -m ./.ci_support/${CONFIG}.yaml
2 changes: 1 addition & 1 deletion LICENSE → LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BSD 3-clause license
Copyright (c) 2015-2017, conda-forge
Copyright (c) 2015-2018, conda-forge
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ and fine-tune the adaptive sampling algorithm.
Current build status
====================

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

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

| Name | Downloads | Version | Platforms |
| --- | --- | --- | --- |
| [![Conda Recipe](https://img.shields.io/badge/recipe-adaptive-green.svg)](https://anaconda.org/conda-forge/adaptive) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/adaptive.svg)](https://anaconda.org/conda-forge/adaptive) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/adaptive.svg)](https://anaconda.org/conda-forge/adaptive) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/adaptive.svg)](https://anaconda.org/conda-forge/adaptive) |

Installing adaptive
===================
Expand Down
71 changes: 0 additions & 71 deletions ci_support/run_docker_build.sh

This file was deleted.

0 comments on commit 49b7a32

Please sign in to comment.