From 4f8c0d78ae4544fa49f209589aa097912c0888a5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 13 Mar 2019 00:07:11 -0500 Subject: [PATCH 1/4] Build for aarch64 and ppc64le --- conda-forge.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index e9759d0..408842e 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,3 +5,7 @@ max_py_ver: '37' max_r_ver: '35' travis: secure: {BINSTAR_TOKEN: LK1A652XENKnoDfAUgzbzFAiYZxYThs6lbE/OY3GP1vHUoyY+6ewCG/AIb7DKv/MImsj/hIgvkgNbxgKsrydYbafCpOOwBkpDK1AkwFKWMEkezE/rcogoqqcq1m6kwU6HuuqPZL8sjpxWnAS2vbJr0DrVGFjEBy8hUBnFn+wQ48g5vsd0jQzcTwmAyaVPkPhAv3ayj4Jhv8wy5cH6jWC6w+T07yukO5pYZpFLelrTsF/R7Z3i+QVshwaYqkG8VobNY9c7hn3edfj6Bsp3oRTIbQdKTzhmkksVJ5Wy0WTWk4rhTMTZxShBINXl4WkXhkv6d5doqbIXfMGTlT7ECE0zjFwd3Px7YjjKtIyMl1gmYpcvKwfQ5ZM6U915jQ9Sty9BQEYgItVh0oW5Nrkv0vbG2O5/JjbAQzSpAHaiIypjh30Oc04m1tO04Wu17W+AyA+SibwW9pwbg6bVRxa28RqSFANs3b4I+y05JN2sBb/O00E3jYNw3lPLXGRQYf9YleU4xAam9OmM1ImxiMwTtXp8dcAsHbXIS1kRensWcxLcM4fY7pFHa3OtRNSizncU74iHaxMhFmGCiBo02j5KEZWRNJQmzmq/jQIOR536n2yvAXtFBaf6Q+xoKBcr3c4kTQ4H0fWrsS84K+nMXps2CoHtP6rCcm29nCAM8ItgKgJG74=} + +provider: + linux_ppc64le: azure + linux_aarch64: azure From 8ba6d96b8f048d8cffe10b48d413be9754d43191 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 13 Mar 2019 00:07:27 -0500 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and conda-forge-pinning 2019.03.11 --- .appveyor.yml | 19 ++- .azure-pipelines/azure-pipelines-linux.yml | 57 +++++++++ .azure-pipelines/azure-pipelines-osx.yml | 92 +++++++++++++++ .azure-pipelines/azure-pipelines-win.yml | 109 ++++++++++++++++++ .azure-pipelines/build_steps.sh | 38 ++++++ .azure-pipelines/run_docker_build.sh | 57 +++++++++ .ci_support/linux_aarch64_python2.7.yaml | 20 ++++ .ci_support/linux_aarch64_python3.6.yaml | 20 ++++ .ci_support/linux_aarch64_python3.7.yaml | 20 ++++ .ci_support/linux_c_compilergccpython2.7.yaml | 22 ---- .ci_support/linux_c_compilergccpython3.6.yaml | 22 ---- .ci_support/linux_c_compilergccpython3.7.yaml | 22 ---- .../linux_c_compilertoolchain_cpython2.7.yaml | 22 ---- .../linux_c_compilertoolchain_cpython3.6.yaml | 22 ---- .../linux_c_compilertoolchain_cpython3.7.yaml | 22 ---- .ci_support/linux_ppc64le_python2.7.yaml | 14 +++ .ci_support/linux_ppc64le_python3.6.yaml | 14 +++ .ci_support/linux_ppc64le_python3.7.yaml | 14 +++ .ci_support/linux_python2.7.yaml | 14 +++ .ci_support/linux_python3.6.yaml | 14 +++ .ci_support/linux_python3.7.yaml | 14 +++ .ci_support/osx_c_compilerclangpython2.7.yaml | 25 ---- .ci_support/osx_c_compilerclangpython3.6.yaml | 25 ---- .ci_support/osx_c_compilerclangpython3.7.yaml | 25 ---- ...ain_cpython2.7.yaml => osx_python2.7.yaml} | 9 +- ...ain_cpython3.6.yaml => osx_python3.6.yaml} | 9 +- ...ain_cpython3.7.yaml => osx_python3.7.yaml} | 9 +- .circleci/build_steps.sh | 11 +- .circleci/config.yml | 82 +++---------- .circleci/fast_finish_ci_pr_build.sh | 2 +- .circleci/run_docker_build.sh | 17 ++- .travis.yml | 21 ++-- README.md | 15 ++- azure-pipelines.yml | 8 ++ 34 files changed, 574 insertions(+), 332 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-linux.yml create mode 100755 .azure-pipelines/azure-pipelines-osx.yml create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100755 .azure-pipelines/build_steps.sh create mode 100755 .azure-pipelines/run_docker_build.sh create mode 100644 .ci_support/linux_aarch64_python2.7.yaml create mode 100644 .ci_support/linux_aarch64_python3.6.yaml create mode 100644 .ci_support/linux_aarch64_python3.7.yaml delete mode 100644 .ci_support/linux_c_compilergccpython2.7.yaml delete mode 100644 .ci_support/linux_c_compilergccpython3.6.yaml delete mode 100644 .ci_support/linux_c_compilergccpython3.7.yaml delete mode 100644 .ci_support/linux_c_compilertoolchain_cpython2.7.yaml delete mode 100644 .ci_support/linux_c_compilertoolchain_cpython3.6.yaml delete mode 100644 .ci_support/linux_c_compilertoolchain_cpython3.7.yaml create mode 100644 .ci_support/linux_ppc64le_python2.7.yaml create mode 100644 .ci_support/linux_ppc64le_python3.6.yaml create mode 100644 .ci_support/linux_ppc64le_python3.7.yaml create mode 100644 .ci_support/linux_python2.7.yaml create mode 100644 .ci_support/linux_python3.6.yaml create mode 100644 .ci_support/linux_python3.7.yaml delete mode 100644 .ci_support/osx_c_compilerclangpython2.7.yaml delete mode 100644 .ci_support/osx_c_compilerclangpython3.6.yaml delete mode 100644 .ci_support/osx_c_compilerclangpython3.7.yaml rename .ci_support/{osx_c_compilertoolchain_cpython2.7.yaml => osx_python2.7.yaml} (66%) rename .ci_support/{osx_c_compilertoolchain_cpython3.6.yaml => osx_python3.6.yaml} (66%) rename .ci_support/{osx_c_compilertoolchain_cpython3.7.yaml => osx_python3.7.yaml} (66%) create mode 100644 azure-pipelines.yml diff --git a/.appveyor.yml b/.appveyor.yml index cbd808a..8e6230d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,7 @@ # This file was automatically generated by conda-smithy. To update a component of this # file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run # "conda smithy rerender". +# -*- mode: yaml -*- environment: @@ -27,11 +28,11 @@ 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-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%" + powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" + "%CONDA_INSTALL_LOCN%\python.exe" ff_ci_pr_build.py -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py - # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - cmd: rmdir C:\cygwin /s /q # Add path, activate `conda` and update conda. @@ -40,20 +41,16 @@ install: - cmd: set PYTHONUNBUFFERED=1 - # Add our channels. - - 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.exe install -n root --quiet --yes conda-forge-ci-setup=2 + # Tell conda we want an updated version of conda-forge-ci-setup and conda-build + - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build + - cmd: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - cmd: run_conda_forge_build_setup # Skip .NET project specific build phase. build: off test_script: - - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + - conda.exe build recipe -m .ci_support\%CONFIG%.yaml deploy_script: - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml new file mode 100755 index 0000000..93cdf3d --- /dev/null +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -0,0 +1,57 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: linux + pool: + vmImage: ubuntu-16.04 + timeoutInMinutes: 240 + strategy: + maxParallel: 8 + matrix: + linux_aarch64_python2.7: + CONFIG: linux_aarch64_python2.7 + UPLOAD_PACKAGES: True + linux_aarch64_python3.6: + CONFIG: linux_aarch64_python3.6 + UPLOAD_PACKAGES: True + linux_aarch64_python3.7: + CONFIG: linux_aarch64_python3.7 + UPLOAD_PACKAGES: True + linux_ppc64le_python2.7: + CONFIG: linux_ppc64le_python2.7 + UPLOAD_PACKAGES: True + linux_ppc64le_python3.6: + CONFIG: linux_ppc64le_python3.6 + UPLOAD_PACKAGES: True + linux_ppc64le_python3.7: + CONFIG: linux_ppc64le_python3.7 + UPLOAD_PACKAGES: True + linux_python2.7: + CONFIG: linux_python2.7 + UPLOAD_PACKAGES: False + linux_python3.6: + CONFIG: linux_python3.6 + UPLOAD_PACKAGES: False + linux_python3.7: + CONFIG: linux_python3.7 + UPLOAD_PACKAGES: False + steps: + - script: | + sudo pip install --upgrade pip + sudo pip install setuptools shyaml + displayName: Install dependencies + + # 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 + ls /proc/sys/fs/binfmt_misc/ + condition: not(startsWith(variables['CONFIG'], 'linux_64')) + displayName: Configure binfmt_misc + + - script: .azure-pipelines/run_docker_build.sh + displayName: Run docker build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml new file mode 100755 index 0000000..35efd7c --- /dev/null +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -0,0 +1,92 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: osx + pool: + vmImage: macOS-10.13 + timeoutInMinutes: 240 + strategy: + maxParallel: 8 + matrix: + osx_python2.7: + CONFIG: osx_python2.7 + UPLOAD_PACKAGES: False + osx_python3.6: + CONFIG: osx_python3.6 + UPLOAD_PACKAGES: False + osx_python3.7: + CONFIG: osx_python3.7 + UPLOAD_PACKAGES: False + + steps: + # TODO: Fast finish on azure pipelines? + - script: | + echo "Fast Finish" + + + - script: | + echo "Removing homebrew from Azure to avoid conflicts." + curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew + chmod +x ~/uninstall_homebrew + ~/uninstall_homebrew -fq + 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' + + - 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 + displayName: 'Add conda-forge-ci-setup=2' + + - script: | + set -x -e + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + echo "Configuring conda." + + setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml + + source run_conda_forge_build_setup + conda update --yes --quiet --override-channels -c conda-forge -c defaults --all + env: { + OSX_FORCE_SDK_DOWNLOAD: "1" + } + displayName: Configure conda and conda-build + + - script: | + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + set -x -e + mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml + displayName: Mangle compiler + + - script: | + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + set -x -e + 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 + 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 + upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + displayName: Upload recipe + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..ba27b11 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,109 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: vs2017-win2016 + timeoutInMinutes: 240 + strategy: + maxParallel: 4 + matrix: + win_c_compilervs2008python2.7: + CONFIG: win_c_compilervs2008python2.7 + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False + win_c_compilervs2015python3.6: + CONFIG: win_c_compilervs2015python3.6 + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False + win_c_compilervs2015python3.7: + CONFIG: win_c_compilervs2015python3.7 + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False + steps: + # TODO: Fast finish on azure pipelines? + - script: | + ECHO ON + + + - script: | + choco install vcpython27 -fdv -y --debug + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Install vcpython27.msi (if needed) + + # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + # - script: rmdir C:\cygwin /s /q + # continueOnError: true + + - powershell: | + Set-PSDebug -Trace 1 + + $batchcontent = @" + ECHO ON + SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 + + DIR "%vcpython%" + + CALL "%vcpython%\vcvarsall.bat" %* + "@ + + $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" + $batchPath = "$batchDir" + "\vcvarsall.bat" + New-Item -Path $batchPath -ItemType "file" -Force + + Set-Content -Value $batchcontent -Path $batchPath + + Get-ChildItem -Path $batchDir + + Get-ChildItem -Path ($batchDir + '\..') + + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Patch vs2008 (if needed) + + - task: CondaEnvironment@1 + inputs: + packageSpecs: 'python=3.6 conda-build conda conda-forge::conda-forge-ci-setup=2' # Optional + installOptions: "-c conda-forge" + updateConda: false + displayName: Install conda-build and activate environment + + - script: set PYTHONUNBUFFERED=1 + + # Configure the VM + - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml + + # Configure the VM. + - script: | + run_conda_forge_build_setup + + displayName: conda-forge build setup + + + - script: | + rmdir C:\strawberry /s /q + continueOnError: true + displayName: remove strawberryperl + + # Special cased version setting some more things! + - script: | + conda.exe build recipe -m .ci_support\%CONFIG%.yaml + displayName: Build recipe (vs2008) + env: + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" + PYTHONUNBUFFERED: 1 + condition: contains(variables['CONFIG'], 'vs2008') + + - script: | + conda.exe build recipe -m .ci_support\%CONFIG%.yaml + displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 + condition: not(contains(variables['CONFIG'], 'vs2008')) + + - script: | + upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) diff --git a/.azure-pipelines/build_steps.sh b/.azure-pipelines/build_steps.sh new file mode 100755 index 0000000..779d52b --- /dev/null +++ b/.azure-pipelines/build_steps.sh @@ -0,0 +1,38 @@ +#!/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 </dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" + +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 + +pip install shyaml +DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) + +mkdir -p "$ARTIFACTS" +DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +rm -f "$DONE_CANARY" +# Not all providers run with a real tty. Disable using one +DOCKER_RUN_ARGS=" " + +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -e CONFIG \ + -e BINSTAR_TOKEN \ + -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ + $DOCKER_IMAGE \ + bash \ + /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + +# verify that the end of the script was reached +test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.ci_support/linux_aarch64_python2.7.yaml b/.ci_support/linux_aarch64_python2.7.yaml new file mode 100644 index 0000000..c4bf94a --- /dev/null +++ b/.ci_support/linux_aarch64_python2.7.yaml @@ -0,0 +1,20 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge,c4aarch64,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-aarch64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' diff --git a/.ci_support/linux_aarch64_python3.6.yaml b/.ci_support/linux_aarch64_python3.6.yaml new file mode 100644 index 0000000..8d2313b --- /dev/null +++ b/.ci_support/linux_aarch64_python3.6.yaml @@ -0,0 +1,20 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge,c4aarch64,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-aarch64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.ci_support/linux_aarch64_python3.7.yaml b/.ci_support/linux_aarch64_python3.7.yaml new file mode 100644 index 0000000..39199de --- /dev/null +++ b/.ci_support/linux_aarch64_python3.7.yaml @@ -0,0 +1,20 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge,c4aarch64,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-aarch64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' diff --git a/.ci_support/linux_c_compilergccpython2.7.yaml b/.ci_support/linux_c_compilergccpython2.7.yaml deleted file mode 100644 index 96c7370..0000000 --- a/.ci_support/linux_c_compilergccpython2.7.yaml +++ /dev/null @@ -1,22 +0,0 @@ -build_number_decrement: -- '0' -c_compiler: -- gcc -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -docker_image: -- conda/c3i-linux-64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilergccpython3.6.yaml b/.ci_support/linux_c_compilergccpython3.6.yaml deleted file mode 100644 index df74784..0000000 --- a/.ci_support/linux_c_compilergccpython3.6.yaml +++ /dev/null @@ -1,22 +0,0 @@ -build_number_decrement: -- '0' -c_compiler: -- gcc -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -docker_image: -- conda/c3i-linux-64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilergccpython3.7.yaml b/.ci_support/linux_c_compilergccpython3.7.yaml deleted file mode 100644 index 9f92767..0000000 --- a/.ci_support/linux_c_compilergccpython3.7.yaml +++ /dev/null @@ -1,22 +0,0 @@ -build_number_decrement: -- '0' -c_compiler: -- gcc -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -docker_image: -- conda/c3i-linux-64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilertoolchain_cpython2.7.yaml b/.ci_support/linux_c_compilertoolchain_cpython2.7.yaml deleted file mode 100644 index 0bbeacf..0000000 --- a/.ci_support/linux_c_compilertoolchain_cpython2.7.yaml +++ /dev/null @@ -1,22 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilertoolchain_cpython3.6.yaml b/.ci_support/linux_c_compilertoolchain_cpython3.6.yaml deleted file mode 100644 index 9d5867a..0000000 --- a/.ci_support/linux_c_compilertoolchain_cpython3.6.yaml +++ /dev/null @@ -1,22 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilertoolchain_cpython3.7.yaml b/.ci_support/linux_c_compilertoolchain_cpython3.7.yaml deleted file mode 100644 index 81b60f6..0000000 --- a/.ci_support/linux_c_compilertoolchain_cpython3.7.yaml +++ /dev/null @@ -1,22 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_ppc64le_python2.7.yaml b/.ci_support/linux_ppc64le_python2.7.yaml new file mode 100644 index 0000000..ccdd788 --- /dev/null +++ b/.ci_support/linux_ppc64le_python2.7.yaml @@ -0,0 +1,14 @@ +c_compiler: +- gcc +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' diff --git a/.ci_support/linux_ppc64le_python3.6.yaml b/.ci_support/linux_ppc64le_python3.6.yaml new file mode 100644 index 0000000..2a8bb8f --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.6.yaml @@ -0,0 +1,14 @@ +c_compiler: +- gcc +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.ci_support/linux_ppc64le_python3.7.yaml b/.ci_support/linux_ppc64le_python3.7.yaml new file mode 100644 index 0000000..459f5e6 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.7.yaml @@ -0,0 +1,14 @@ +c_compiler: +- gcc +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml new file mode 100644 index 0000000..dfe82b9 --- /dev/null +++ b/.ci_support/linux_python2.7.yaml @@ -0,0 +1,14 @@ +c_compiler: +- gcc +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-comp7 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml new file mode 100644 index 0000000..78fb294 --- /dev/null +++ b/.ci_support/linux_python3.6.yaml @@ -0,0 +1,14 @@ +c_compiler: +- gcc +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-comp7 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml new file mode 100644 index 0000000..b3aafeb --- /dev/null +++ b/.ci_support/linux_python3.7.yaml @@ -0,0 +1,14 @@ +c_compiler: +- gcc +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- condaforge/linux-anvil-comp7 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' diff --git a/.ci_support/osx_c_compilerclangpython2.7.yaml b/.ci_support/osx_c_compilerclangpython2.7.yaml deleted file mode 100644 index f50acb4..0000000 --- a/.ci_support/osx_c_compilerclangpython2.7.yaml +++ /dev/null @@ -1,25 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -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' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangpython3.6.yaml b/.ci_support/osx_c_compilerclangpython3.6.yaml deleted file mode 100644 index af7350d..0000000 --- a/.ci_support/osx_c_compilerclangpython3.6.yaml +++ /dev/null @@ -1,25 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -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' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangpython3.7.yaml b/.ci_support/osx_c_compilerclangpython3.7.yaml deleted file mode 100644 index 5b23349..0000000 --- a/.ci_support/osx_c_compilerclangpython3.7.yaml +++ /dev/null @@ -1,25 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -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.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_cpython2.7.yaml b/.ci_support/osx_python2.7.yaml similarity index 66% rename from .ci_support/osx_c_compilertoolchain_cpython2.7.yaml rename to .ci_support/osx_python2.7.yaml index aa34ba3..b533f6e 100644 --- a/.ci_support/osx_c_compilertoolchain_cpython2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: @@ -18,8 +16,3 @@ pin_run_as_build: max_pin: x.x python: - '2.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_cpython3.6.yaml b/.ci_support/osx_python3.6.yaml similarity index 66% rename from .ci_support/osx_c_compilertoolchain_cpython3.6.yaml rename to .ci_support/osx_python3.6.yaml index 501bafa..ac3866b 100644 --- a/.ci_support/osx_c_compilertoolchain_cpython3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: @@ -18,8 +16,3 @@ pin_run_as_build: max_pin: x.x python: - '3.6' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_cpython3.7.yaml b/.ci_support/osx_python3.7.yaml similarity index 66% rename from .ci_support/osx_c_compilertoolchain_cpython3.7.yaml rename to .ci_support/osx_python3.7.yaml index b3c7a27..3598ab9 100644 --- a/.ci_support/osx_c_compilertoolchain_cpython3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: @@ -18,8 +16,3 @@ pin_run_as_build: max_pin: x.x python: - '3.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh index 258a085..1301eb6 100755 --- a/.circleci/build_steps.sh +++ b/.circleci/build_steps.sh @@ -19,22 +19,21 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge::conda-forge-ci-setup=2 conda-build +conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge # 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 + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" -upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +fi touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.circleci/config.yml b/.circleci/config.yml index abeba37..59da584 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,62 +1,15 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + version: 2 jobs: - build_linux_c_compilergccpython2.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergccpython2.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_c_compilergccpython3.6: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergccpython3.6" - 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_c_compilergccpython3.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergccpython3.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_c_compilertoolchain_cpython2.7: + build_linux_python2.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_cpython2.7" + - CONFIG: "linux_python2.7" steps: - checkout - run: @@ -65,15 +18,15 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + 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 - build_linux_c_compilertoolchain_cpython3.6: + build_linux_python3.6: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_cpython3.6" + - CONFIG: "linux_python3.6" steps: - checkout - run: @@ -82,15 +35,15 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + 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 - build_linux_c_compilertoolchain_cpython3.7: + build_linux_python3.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_cpython3.7" + - CONFIG: "linux_python3.7" steps: - checkout - run: @@ -99,7 +52,7 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + 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 @@ -108,9 +61,6 @@ workflows: version: 2 build_and_test: jobs: - - build_linux_c_compilergccpython2.7 - - build_linux_c_compilergccpython3.6 - - build_linux_c_compilergccpython3.7 - - build_linux_c_compilertoolchain_cpython2.7 - - build_linux_c_compilertoolchain_cpython3.6 - - build_linux_c_compilertoolchain_cpython3.7 + - build_linux_python2.7 + - build_linux_python3.6 + - build_linux_python3.7 diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh index 8c048ac..4c0b560 100755 --- a/.circleci/fast_finish_ci_pr_build.sh +++ b/.circleci/fast_finish_ci_pr_build.sh @@ -1,4 +1,4 @@ #!/bin/bash -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ +curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/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}" diff --git a/.circleci/run_docker_build.sh b/.circleci/run_docker_build.sh index f2959f6..8bb0bda 100755 --- a/.circleci/run_docker_build.sh +++ b/.circleci/run_docker_build.sh @@ -7,6 +7,9 @@ set -xeuo pipefail +THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" + FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" @@ -30,21 +33,25 @@ if [ -z "$CONFIG" ]; then fi pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil ) +DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" rm -f "$DONE_CANARY" +# Enable running in interactive mode attached to a tty +DOCKER_RUN_ARGS=" -it " -docker run -it \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \ +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ -e CONFIG \ -e BINSTAR_TOKEN \ -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ $DOCKER_IMAGE \ bash \ - /home/conda/feedstock_root/.circleci/build_steps.sh + /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh # verify that the end of the script was reached test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1dfa551..2afa038 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,18 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- language: generic os: osx -osx_image: xcode6.4 +osx_image: xcode9.4 + env: matrix: - - CONFIG=osx_c_compilerclangpython2.7 - - CONFIG=osx_c_compilerclangpython3.6 - - CONFIG=osx_c_compilerclangpython3.7 - - CONFIG=osx_c_compilertoolchain_cpython2.7 - - CONFIG=osx_c_compilertoolchain_cpython3.6 - - CONFIG=osx_c_compilertoolchain_cpython3.7 + - CONFIG=osx_python2.7 + - CONFIG=osx_python3.6 + - CONFIG=osx_python3.7 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. @@ -23,7 +22,7 @@ env: before_install: # Fast finish the PR. - | - (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ + (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 # Remove homebrew. @@ -52,7 +51,7 @@ install: echo "Configuring conda." source /Users/travis/miniconda3/bin/activate root - conda install --yes --quiet conda-forge::conda-forge-ci-setup=2 + conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml source run_conda_forge_build_setup @@ -64,5 +63,5 @@ install: script: # generate the build number clobber - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml \ No newline at end of file diff --git a/README.md b/README.md index 4147315..cf4692d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ + + About ruamel_yaml ================= @@ -16,7 +20,7 @@ Current build status [![Linux](https://img.shields.io/circleci/project/github/conda-forge/ruamel_yaml-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/ruamel_yaml-feedstock) [![OSX](https://img.shields.io/travis/conda-forge/ruamel_yaml-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/ruamel_yaml-feedstock) -[![Windows](https://img.shields.io/appveyor/ci/conda-forge/ruamel_yaml-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/ruamel-yaml-feedstock/branch/master) +[![Windows](https://img.shields.io/appveyor/ci/conda-forge/ruamel-yaml-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/ruamel-yaml-feedstock/branch/master) Current release info ==================== @@ -50,6 +54,8 @@ conda search ruamel_yaml --channel conda-forge About conda-forge ================= +[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) + conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the conda-forge GitHub organization. The conda-forge organization contains one repository @@ -104,3 +110,10 @@ In order to produce a uniquely identifiable distribution: * If the version of a package **is** being increased, please remember to return the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) back to 0. + +Feedstock Maintainers +===================== + +* [@jakirkham](https://github.com/jakirkham/) +* [@mbargull](https://github.com/mbargull/) + diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..e5306da --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,8 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From ce7607ae63ed235b87a79f22bb41340489fe6ebd Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 13 Mar 2019 00:25:11 -0500 Subject: [PATCH 3/4] Remove downstream conda tests as they are conda version specific --- recipe/run_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/run_test.py b/recipe/run_test.py index 9e0c4f2..676fd57 100755 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -15,6 +15,7 @@ assert ver_string == ruamel_yaml.__version__ +""" # downstream conda config tests import os from os.path import join @@ -41,3 +42,4 @@ assert b'_test_channel_' in conda_config_show_sources, conda_config_show_sources os.remove(condarc_path) os.rmdir(tmp_dir) +""" From ca37477c0028fa1fe0e7eb2cf27616e5d4ae0f49 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 13 Mar 2019 00:35:31 -0500 Subject: [PATCH 4/4] remove conda as a test requirement --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b1ede88..b6a8649 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,7 +33,6 @@ requirements: test: requires: - pytest - - conda imports: - ruamel_yaml