From ca1548d8a657491e2883ffdbec85be522f8734bd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Tue, 29 Jan 2019 12:09:16 +0000 Subject: [PATCH 1/2] updated v1.5.2 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fc28352..4896f7c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,9 +3,9 @@ # https://github.com/scrapy/scrapy/wiki/Scrapy-release-procedure#conda-packages # {% set name = "Scrapy" %} -{% set version = "1.5.1" %} +{% set version = "1.5.2" %} {% set hash_type = "sha256" %} -{% set hash_val = "5a398bf6818f87dcc817c919408a195f19ba46414ae12f259119336cfa862bb6" %} +{% set hash_val = "005933cc426b8ff7eae84ef8b9370f6465f9e43c4daede68474711b5e21fe607" %} package: name: {{ name|lower }} @@ -20,7 +20,7 @@ build: script: python setup.py install --single-version-externally-managed --record=record.txt entry_points: - scrapy = scrapy.cmdline:execute - number: 1000 + number: 0 # The requirements below shall match the requirements from the target package # version (check setup.py for changes). From 89b0c7049990d9285c3e1766c45c71606d311296 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Tue, 29 Jan 2019 12:09:27 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.15.1, conda-smithy 3.2.10, and conda-forge-pinning 2019.01.21 --- .appveyor.yml | 17 ++-- .azure-pipelines/azure-pipelines-linux.yml | 37 ++++++++ .azure-pipelines/azure-pipelines-osx.yml | 90 +++++++++++++++++++ .azure-pipelines/azure-pipelines-win.yml | 100 +++++++++++++++++++++ .azure-pipelines/build_steps.sh | 38 ++++++++ .azure-pipelines/run_docker_build.sh | 57 ++++++++++++ .ci_support/linux_python2.7.yaml | 7 +- .ci_support/linux_python3.6.yaml | 7 +- .ci_support/linux_python3.7.yaml | 7 +- .ci_support/osx_python2.7.yaml | 4 - .ci_support/osx_python3.6.yaml | 4 - .ci_support/osx_python3.7.yaml | 4 - .circleci/build_steps.sh | 11 ++- .circleci/config.yml | 10 ++- .circleci/fast_finish_ci_pr_build.sh | 2 +- .circleci/run_docker_build.sh | 17 ++-- .travis.yml | 12 +-- README.md | 13 +++ azure-pipelines.yml | 8 ++ 19 files changed, 385 insertions(+), 60 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 azure-pipelines.yml diff --git a/.appveyor.yml b/.appveyor.yml index 21417e2..a52e302 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')" + 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')" 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 - # 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..eb9811e --- /dev/null +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -0,0 +1,37 @@ +# 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_64 + pool: + vmImage: ubuntu-16.04 + timeoutInMinutes: 240 + strategy: + maxParallel: 8 + matrix: + 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 + 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 \ 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..756bdbb --- /dev/null +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -0,0 +1,90 @@ +# 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_64 + 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 + 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..ae6ec1f --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,100 @@ +# 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_64 + pool: + vmImage: vs2017-win2016 + timeoutInMinutes: 240 + strategy: + maxParallel: 4 + matrix: + win_python2.7: + CONFIG: win_python2.7 + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False + win_python3.6: + CONFIG: win_python3.6 + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False + win_python3.7: + CONFIG: win_python3.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 + + + # Special cased version setting some more things! + - script: | + conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + displayName: Build recipe (vs2008) + env: { + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin", + } + condition: contains(variables['CONFIG'], 'vs2008') + + - script: | + conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + displayName: Build recipe + condition: not(contains(variables['CONFIG'], 'vs2008')) + + - script: | + upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + 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_python2.7.yaml b/.ci_support/linux_python2.7.yaml index a52c5e6..4fa4af2 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -5,15 +5,10 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- conda/c3i-linux-64 +- condaforge/linux-anvil-comp7 pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - '2.7' -zip_keys: -- - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index 10a2f97..4064c0b 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -5,15 +5,10 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- conda/c3i-linux-64 +- condaforge/linux-anvil-comp7 pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - '3.6' -zip_keys: -- - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml index e96cebf..ddcabac 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -5,15 +5,10 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- conda/c3i-linux-64 +- condaforge/linux-anvil-comp7 pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - '3.7' -zip_keys: -- - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml index 2d98036..c5bb9aa 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -18,7 +18,3 @@ pin_run_as_build: max_pin: x.x python: - '2.7' -zip_keys: -- - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml index bb755e8..03de62b 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -18,7 +18,3 @@ pin_run_as_build: max_pin: x.x python: - '3.6' -zip_keys: -- - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml index f73d166..6f78589 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -18,7 +18,3 @@ pin_run_as_build: max_pin: x.x python: - '3.7' -zip_keys: -- - 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 e4524f1..59da584 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,3 +1,7 @@ +# 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: @@ -14,7 +18,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 @@ -31,7 +35,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 @@ -48,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 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 4052df9..c10da36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,12 @@ # 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: @@ -20,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. @@ -49,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 @@ -61,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 a8db7ec..c7f2853 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ + + About scrapy ============ @@ -52,6 +56,8 @@ conda search scrapy --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 @@ -106,3 +112,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 +===================== + +* [@redapple](https://github.com/redapple/) +* [@rmax](https://github.com/rmax/) + 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