Skip to content

Commit

Permalink
MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.09.27
Browse files Browse the repository at this point in the history
  • Loading branch information
hmaarrfk committed Sep 30, 2018
1 parent 40f388c commit 6d3cf57
Show file tree
Hide file tree
Showing 24 changed files with 377 additions and 158 deletions.
45 changes: 15 additions & 30 deletions appveyor.yml → .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,14 @@ environment:
secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1

matrix:
- TARGET_ARCH: x86
CONDA_PY: 27
CONDA_INSTALL_LOCN: C:\\Miniconda
- CONFIG: win_c_compilervs2008cxx_compilervs2008python2.7
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- TARGET_ARCH: x64
CONDA_PY: 27
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
- CONFIG: win_c_compilervs2015cxx_compilervs2015python3.5
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- TARGET_ARCH: x86
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35

- TARGET_ARCH: x64
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64

- 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_c_compilervs2015cxx_compilervs2015python3.6
CONDA_INSTALL_LOCN: C:\Miniconda36-x64


# We always use a 64-bit machine, but can build x86 distributions
Expand All @@ -42,7 +27,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/branch2.0/recipe/conda_forge_ci_setup/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 @@ -51,24 +36,24 @@ install:

# Add path, activate `conda` and update conda.
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- cmd: conda update --yes --quiet conda
- cmd: conda.exe update --yes --quiet conda

- cmd: set PYTHONUNBUFFERED=1

# Add our channels.
- cmd: conda config --set show_channel_urls true
- cmd: conda config --remove channels defaults
- cmd: conda config --add channels defaults
- cmd: conda config --add channels conda-forge
- cmd: conda.exe config --set show_channel_urls true
- cmd: conda.exe config --remove channels defaults
- cmd: conda.exe config --add channels defaults
- cmd: conda.exe config --add channels conda-forge

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

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

test_script:
- conda 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_package .\ .\recipe .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.
16 changes: 16 additions & 0 deletions .ci_support/linux_python2.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '2.7'
16 changes: 16 additions & 0 deletions .ci_support/linux_python3.5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.5'
16 changes: 16 additions & 0 deletions .ci_support/linux_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
docker_image:
- condaforge/linux-anvil
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
20 changes: 20 additions & 0 deletions .ci_support/osx_python2.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
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:
- '2.7'
20 changes: 20 additions & 0 deletions .ci_support/osx_python3.5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
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.5'
20 changes: 20 additions & 0 deletions .ci_support/osx_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- toolchain_c
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- toolchain_cxx
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'
18 changes: 18 additions & 0 deletions .ci_support/win_c_compilervs2008cxx_compilervs2008python2.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
c_compiler:
- vs2008
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- vs2008
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '2.7'
zip_keys:
- - python
- c_compiler
- cxx_compiler
18 changes: 18 additions & 0 deletions .ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
c_compiler:
- vs2015
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- vs2015
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.5'
zip_keys:
- - python
- c_compiler
- cxx_compiler
18 changes: 18 additions & 0 deletions .ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
c_compiler:
- vs2015
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- vs2015
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- '3.6'
zip_keys:
- - python
- c_compiler
- cxx_compiler
40 changes: 40 additions & 0 deletions .circleci/build_steps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/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
export FEEDSTOCK_ROOT=/home/conda/feedstock_root
export RECIPE_ROOT=/home/conda/recipe_root
export CI_SUPPORT=/home/conda/feedstock_root/.ci_support
export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml"

cat >~/.condarc <<CONDARC
conda-build:
root-dir: /home/conda/feedstock_root/build_artifacts
CONDARC

conda install --yes --quiet conda-forge::conda-forge-ci-setup=2 conda-build

# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

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

source run_conda_forge_build_setup

# make the build number clobber
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" --quiet

upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

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

jobs:
build__CONDA_PY_27:
build_linux_python2.7:
working_directory: ~/test
machine: true
environment:
- CONDA_PY: "27"
- CONFIG: "linux_python2.7"
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
build__CONDA_PY_35:
command: ./.circleci/run_docker_build.sh
build_linux_python3.5:
working_directory: ~/test
machine: true
environment:
- CONDA_PY: "35"
- CONFIG: "linux_python3.5"
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
build__CONDA_PY_36:
command: ./.circleci/run_docker_build.sh
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_27
- build__CONDA_PY_35
- build__CONDA_PY_36
- build_linux_python2.7
- build_linux_python3.5
- 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/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \
python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}"
Loading

0 comments on commit 6d3cf57

Please sign in to comment.