Skip to content

Commit

Permalink
MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.3.2, and con…
Browse files Browse the repository at this point in the history
…da-forge-pinning 2019.04.12
  • Loading branch information
regro-cf-autotick-bot committed Apr 16, 2019
1 parent fc4ad0f commit 0e8252f
Show file tree
Hide file tree
Showing 17 changed files with 95 additions and 246 deletions.
6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ jobs:
- job: linux
pool:
vmImage: ubuntu-16.04
timeoutInMinutes: 240
timeoutInMinutes: 360
strategy:
maxParallel: 8
matrix:
linux_:
CONFIG: linux_
UPLOAD_PACKAGES: False
UPLOAD_PACKAGES: True
linux_aarch64_:
CONFIG: linux_aarch64_
UPLOAD_PACKAGES: True
Expand All @@ -25,7 +25,7 @@ jobs:
sudo pip install setuptools shyaml
displayName: Install dependencies
# configure qemu binfmt-misc running. This allows us to run docker containers
# configure qemu binfmt-misc running. This allows us to run docker containers
# embedded qemu-static
- script: |
docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
Expand Down
37 changes: 13 additions & 24 deletions .azure-pipelines/azure-pipelines-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ jobs:
- job: osx
pool:
vmImage: macOS-10.13
timeoutInMinutes: 240
timeoutInMinutes: 360
strategy:
maxParallel: 8
matrix:
osx_:
CONFIG: osx_
UPLOAD_PACKAGES: False
UPLOAD_PACKAGES: True

steps:
# TODO: Fast finish on azure pipelines?
Expand All @@ -28,25 +28,18 @@ jobs:
rm ~/uninstall_homebrew
displayName: Remove homebrew
- script: |
echo "Installing Miniconda"
set -x -e
curl -o $(Build.StagingDirectory)/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
chmod +x $(Build.StagingDirectory)/miniconda.sh
$(Build.StagingDirectory)/miniconda.sh -b -p $(Build.StagingDirectory)/miniconda
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
echo "Setting up Conda environment"
displayName: 'Install miniconda'
- bash: |
echo "##vso[task.prependpath]$CONDA/bin"
sudo chown -R $USER $CONDA
displayName: Add conda to PATH
- script: |
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
set -x -e
conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
source activate base
conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build shyaml
displayName: 'Add conda-forge-ci-setup=2'
- script: |
set -x -e
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
source activate base
echo "Configuring conda."
setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml
Expand All @@ -59,26 +52,22 @@ jobs:
displayName: Configure conda and conda-build
- script: |
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
set -x -e
source activate base
mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml
displayName: Mangle compiler
- script: |
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
set -x -e
source activate base
make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml
displayName: Generate build number clobber file
- script: |
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
set -x -e
source activate base
conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml
displayName: Build recipe
- script: |
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
set -x -e
source activate base
upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml
displayName: Upload recipe
env:
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
- job: win
pool:
vmImage: vs2017-win2016
timeoutInMinutes: 240
timeoutInMinutes: 360
strategy:
maxParallel: 4
matrix:
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:

# Configure the VM
- script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml

# Configure the VM.
- script: |
run_conda_forge_build_setup
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/linux_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ bzip2:
- '1'
c_compiler:
- gcc
c_compiler_version:
- '7'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -11,7 +13,7 @@ docker_image:
libxml2:
- '2.9'
lz4_c:
- 1.8.1
- 1.8.3
lzo:
- '2'
openssl:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ bzip2:
- '1'
c_compiler:
- gcc
c_compiler_version:
- '7'
cdt_arch:
- aarch64
cdt_name:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ bzip2:
- '1'
c_compiler:
- gcc
c_compiler_version:
- '8'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/osx_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ bzip2:
- '1'
c_compiler:
- clang
c_compiler_version:
- '4'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -13,7 +15,7 @@ libiconv:
libxml2:
- '2.9'
lz4_c:
- 1.8.1
- 1.8.3
lzo:
- '2'
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_c_compilervs2015vc14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
libxml2:
- '2.9'
lz4_c:
- 1.8.1
- 1.8.3
lzo:
- '2'
openssl:
Expand Down
39 changes: 0 additions & 39 deletions .circleci/build_steps.sh

This file was deleted.

27 changes: 0 additions & 27 deletions .circleci/checkout_merge_commit.sh

This file was deleted.

22 changes: 8 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,20 @@
version: 2

jobs:
build_linux_:
build:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_"
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-comp7
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./.circleci/run_docker_build.sh
# The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
command: exit 0

workflows:
version: 2
build_and_test:
jobs:
- build_linux_
- build:
filters:
branches:
ignore:
- /.*/
4 changes: 0 additions & 4 deletions .circleci/fast_finish_ci_pr_build.sh

This file was deleted.

57 changes: 0 additions & 57 deletions .circleci/run_docker_build.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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` (Use the phrase <code>@<space/>conda-forge-admin, please rerender</code> in a comment in this PR for automated rerendering)
* [ ] [Re-rendered]( https://conda-forge.org/docs/maintainer/updating_pkgs.html#rerendering-feedstocks ) with the latest `conda-smithy` (Use the phrase <code>@<space/>conda-forge-admin, please rerender</code> in a comment in this PR for automated rerendering)
* [ ] Ensured the license file is being packaged.

<!--
Expand Down
Loading

0 comments on commit 0e8252f

Please sign in to comment.