Skip to content

Commit

Permalink
MNT: Re-rendered with conda-smithy 3.1.9 and pinning 2018.07.24
Browse files Browse the repository at this point in the history
  • Loading branch information
sdvillal committed Aug 1, 2018
1 parent 139c8d5 commit 280d884
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 96 deletions.
2 changes: 2 additions & 0 deletions .ci_support/linux_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
c_compiler:
- toolchain_c
34 changes: 34 additions & 0 deletions .circleci/build_steps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/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:
- loopbio
- 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 loopbio --channel=main -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml

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

jobs:
build_circle_:
build_linux_:
working_directory: ~/test
machine: true
environment:
- CONFIG: "circle_"
- CONFIG: "linux_"
steps:
- checkout
- run:
Expand All @@ -23,4 +23,4 @@ workflows:
version: 2
build_and_test:
jobs:
- build_circle_
- build_linux_
75 changes: 25 additions & 50 deletions .circleci/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,68 +5,43 @@
# 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

config=$(cat <<CONDARC
channels:
- loopbio
- conda-forge
- defaults
conda-build:
root-dir: /home/conda/feedstock_root/build_artifacts
show_channel_urls: true
CONDARC
)

# 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
HOST_USER_ID=$(id -u)
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
HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
fi

rm -f "$FEEDSTOCK_ROOT/build_artifacts/conda-forge-build-done"
ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"

cat << EOF | docker run -i \
-v "${RECIPE_ROOT}":/home/conda/recipe_root \
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \
-e CONFIG="$CONFIG" \
-e HOST_USER_ID="${HOST_USER_ID}" \
-a stdin -a stdout -a stderr \
condaforge/linux-anvil \
bash || exit 1
set -e
set +x
export BINSTAR_TOKEN=${BINSTAR_TOKEN}
set -x
export PYTHONUNBUFFERED=1
echo "$config" > ~/.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
source run_conda_forge_build_setup
conda build /home/conda/recipe_root -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml --quiet || exit 1
upload_or_check_non_existence /home/conda/recipe_root loopbio --channel=main -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml || exit 1
touch /home/conda/feedstock_root/build_artifacts/conda-forge-build-done
EOF
if [ -z "$CONFIG" ]; then
echo "Need to set CONFIG env variable"
exit 1
fi

# double-check that the build got to the end
# see https://github.com/conda-forge/conda-smithy/pull/337
# for a possible fix
set -x
test -f "$FEEDSTOCK_ROOT/build_artifacts/conda-forge-build-done" || exit 1
mkdir -p "$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"
39 changes: 9 additions & 30 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,25 @@
<!--
Thanks for reporting your issue.


Please fill out the sections below.
-->
Issue:


Example (code snippet, shell command, or screenshot):

<details>



</details>

<br>
Environment (`conda env export`):
<br>
<br>

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

```yaml
name: test
channels:
- conda-forge
- defaults
dependencies:
# Please fill these in. :)
-
```
$ conda list
```
</details>

<br>
Details about `conda` and system (`conda info`):
<br>
<br>

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

```
$ conda info
```
</details>
21 changes: 11 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<!--
Thank you for pull request.

Below are a few things we ask you kindly to self-check before getting a review.

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
* [ ] Bump the build number (if the version is unchanged)
* [ ] Bumped the build number (if the version is unchanged)
* [ ] Reset the build number to `0` (if the version changed)
* [ ] [Re-render]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy`
* [ ] Ensure the license file is being packaged.
* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (`@conda-forge-admin, please rerender`)
* [ ] 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:


-->
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ Current build status
Current release info
====================

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

Installing libjpeg-turbo
========================
Expand Down

0 comments on commit 280d884

Please sign in to comment.