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

Update to use pip, and add noarch #7

Merged
merged 3 commits into from
Jul 24, 2018
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
59 changes: 0 additions & 59 deletions .appveyor.yml

This file was deleted.

File renamed without changes.
6 changes: 0 additions & 6 deletions .ci_support/linux_python3.5.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .ci_support/linux_python3.6.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions .ci_support/osx_python2.7.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions .ci_support/osx_python3.5.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions .ci_support/osx_python3.6.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .ci_support/win_python2.7.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .ci_support/win_python3.5.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .ci_support/win_python3.6.yaml

This file was deleted.

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}"
42 changes: 3 additions & 39 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,11 @@
version: 2

jobs:
build_linux_python2.7:
build_linux_:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_python2.7"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./.circleci/fast_finish_ci_pr_build.sh
./.circleci/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./.circleci/run_docker_build.sh
build_linux_python3.5:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_python3.5"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./.circleci/fast_finish_ci_pr_build.sh
./.circleci/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./.circleci/run_docker_build.sh
build_linux_python3.6:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_python3.6"
- CONFIG: "linux_"
steps:
- checkout
- run:
Expand All @@ -57,6 +23,4 @@ workflows:
version: 2
build_and_test:
jobs:
- build_linux_python2.7
- build_linux_python3.5
- build_linux_python3.6
- 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:
- 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

# Make sure we pull in the latest conda-build version too
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 || exit 1
upload_or_check_non_existence /home/conda/recipe_root conda-forge --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"
61 changes: 0 additions & 61 deletions .travis.yml

This file was deleted.

5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ load into memory.
Current build status
====================

[![Linux](https://img.shields.io/circleci/project/github/conda-forge/spectral-cube-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/spectral-cube-feedstock)
[![OSX](https://img.shields.io/travis/conda-forge/spectral-cube-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/spectral-cube-feedstock)
[![Windows](https://img.shields.io/appveyor/ci/conda-forge/spectral-cube-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/spectral-cube-feedstock/branch/master)
All platforms:
[![noarch](https://img.shields.io/circleci/project/github/conda-forge/spectral-cube-feedstock/master.svg?label=noarch)](https://circleci.com/gh/conda-forge/spectral-cube-feedstock)

Current release info
====================
Expand Down
Loading