From b1e12195ef65eb6c5081eb6faade240951b29b43 Mon Sep 17 00:00:00 2001 From: Stuart Berg Date: Mon, 20 Nov 2017 17:37:32 -0500 Subject: [PATCH 1/3] Update to version 0.28.0 Also, removed all prior dependencies and added dependency on google-api-core, per changes to setup.py via GoogleCloudPlatform/google-cloud-python/pull/4221 --- recipe/meta.yaml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9e79765..1a5a6ae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "google-cloud-core" %} -{% set version = "0.27.1" %} -{% set sha256 = "1e52449feb72160a726798a085d7b0cf1d7b88d4b4af00f04d9ca9d6eb47847b" %} +{% set version = "0.28.0" %} +{% set sha256 = "27c62f624cf1ef5010a4aa84db1279f9a2658cc713aeb3e64744513d53ea0bc1" %} package: name: {{ name|lower }} @@ -12,7 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 1 + number: 0 script: python setup.py install --single-version-externally-managed --record record.txt requirements: @@ -22,14 +22,7 @@ requirements: run: - python - - googleapis-common-protos >=1.3.4 - - protobuf >=3.0.0 - - google-auth >=0.4.0,<2dev - - requests >=2.18.0,<3.0.0dev - - setuptools >=34.0.0 - - six >=1.10.0 - # Backport of concurrent.futures for Python < 3.2. - - futures >=3.0.0 # [py2k] + - google-api-core >=0.1.1,<0.2.0dev test: imports: From e5eaa1f9ca737b03bf5c58f92ca40b915c559acf Mon Sep 17 00:00:00 2001 From: Stuart Berg Date: Tue, 21 Nov 2017 08:04:31 -0500 Subject: [PATCH 2/3] Set noarch: python --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1a5a6ae..355aee7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,7 @@ source: build: number: 0 + noarch: python script: python setup.py install --single-version-externally-managed --record record.txt requirements: From 02518fb5fb7c2c9df22adea80daaf662c7776def Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Tue, 21 Nov 2017 13:48:13 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-smithy 2.4.3 --- .circleci/config.yml | 24 +++++++++++ .gitattributes | 2 + .travis.yml | 61 ---------------------------- README.md | 7 ++-- appveyor.yml | 74 ---------------------------------- ci_support/run_docker_build.sh | 21 ++-------- circle.yml | 19 --------- 7 files changed, 32 insertions(+), 176 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 .travis.yml delete mode 100644 appveyor.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..c0a1aa1 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,24 @@ +version: 2 + +jobs: + build: + working_directory: ~/test + machine: true + 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 + - run: + command: docker pull condaforge/linux-anvil + - run: + # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. + command: ./ci_support/run_docker_build.sh + +workflows: + version: 2 + build_and_test: + jobs: + - build diff --git a/.gitattributes b/.gitattributes index 288029d..974953e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,7 @@ * text=auto +*.patch binary +*.diff binary meta.yaml text eol=lf build.sh text eol=lf bld.bat text eol=crlf diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e42233e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,61 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - -os: osx -osx_image: xcode6.4 - -env: - matrix: - - - CONDA_PY=27 - - CONDA_PY=35 - - CONDA_PY=36 - global: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - - secure: "xszBBt2XctoR2VFYOmRHVoeweOufOiF3YX2hJmO7g5UcyurbppdQipiiPM7PK9x1AKQwjIEwx12c6O8+ghvlRTnFJSMHYLlsiJ0paZbwIqf2YB0kHMH/fei5l5S47dJfAYYsBu4tiw/luWmyWsH8L0UVPEjE3NEPcfg1TCi8T/yyy/+HnfFjLaqSi4ryX2/NU8nnTJ3i8E7a1siMQYFwQBRGnm8o8pvwo31MU5d78tDDfyPQSIviejADNseQlbztqlQVL3TL6mdfGzWhP7R5IRNU0cNHJUpic36AVi1EczDJvC5OL4ykCQMg3SeTFteRTZ2FxUhlWzzd0AmeMC6PASqYcDGpRV8zK0gbhh9MdSFZlWMDX4NXPQbwUHACz/9iday/4XWH/tvX4/l9IOIErMuCz3/kq/yoiL+TJv26xHYha/kO+loieUJoqPWHA7pAWsRWMBjMBTcffeRuT35vFVVHvtyBb8HQjJTZfVGar6+l3qMwfQ4Q7L0vS0HQcQM6CnIvox6/5P7LqGtj+5wiMsDNEvxrod4iLsJt53qJTUDv2gSwaDA6DpfZwVf6a023IzKZDJePLhUeG7sHNrjcgnEcd7p5b2KuyjWrc4Dat3R7RnDhHOuPyljFjbfWbQcJfdKAH2YzTRVJTeAikGQBaqeAmmIqnB04Nh5VdDbpXJM=" - - -before_install: - # Fast finish the PR. - - | - (curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ - python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 - - # Remove homebrew. - - | - echo "" - echo "Removing homebrew from Travis CI 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 - - -install: - # Install Miniconda. - - | - echo "" - echo "Installing a fresh version of Miniconda." - MINICONDA_URL="https://repo.continuum.io/miniconda" - MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" - curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}" - bash $MINICONDA_FILE -b - - # Configure conda. - - | - echo "" - echo "Configuring conda." - source /Users/travis/miniconda3/bin/activate root - conda config --remove channels defaults - conda config --add channels defaults - conda config --add channels conda-forge - conda config --set show_channel_urls true - conda install --yes --quiet conda-forge-build-setup - source run_conda_forge_build_setup - -script: - - conda build ./recipe - - - upload_or_check_non_existence ./recipe conda-forge --channel=main diff --git a/README.md b/README.md index 209a147..d7dc43d 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,7 @@ This library is not meant to stand-alone. Instead it defines common helpers (e.g Current build status ==================== -Linux: [![Circle CI](https://circleci.com/gh/conda-forge/google-cloud-core-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/google-cloud-core-feedstock) -OSX: [![TravisCI](https://travis-ci.org/conda-forge/google-cloud-core-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/google-cloud-core-feedstock) -Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/google-cloud-core-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/google-cloud-core-feedstock/branch/master) +All platforms: [![Circle CI](https://circleci.com/gh/conda-forge/google-cloud-core-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/google-cloud-core-feedstock) Current release info ==================== @@ -66,6 +64,7 @@ To manage the continuous integration and simplify feedstock maintenance Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. +For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). Terminology =========== @@ -100,4 +99,4 @@ In order to produce a uniquely identifiable distribution: the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string) - back to 0. + back to 0. \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 341c2c2..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,74 +0,0 @@ -# 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". - -environment: - - BINSTAR_TOKEN: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4 - - matrix: - - TARGET_ARCH: x86 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda - - - TARGET_ARCH: x64 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda-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 - - -# We always use a 64-bit machine, but can build x86 distributions -# with the TARGET_ARCH variable. -platform: - - x64 - -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')" - 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.) - - cmd: rmdir C:\cygwin /s /q - - # Add path, activate `conda` and update conda. - - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - - cmd: conda 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 - - # Configure the VM. - - cmd: conda install -n root --quiet --yes conda-forge-build-setup - - cmd: run_conda_forge_build_setup - -# Skip .NET project specific build phase. -build: off - -test_script: - - conda build recipe --quiet -deploy_script: - - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index ef556d8..57286d0 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -57,24 +57,9 @@ conda clean --lock conda install --yes --quiet conda-forge-build-setup source run_conda_forge_build_setup -# Embarking on 3 case(s). - set -x - export CONDA_PY=27 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_PY=35 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_PY=36 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 +conda build /recipe_root --quiet || exit 1 +upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 + touch /feedstock_root/build_artefacts/conda-forge-build-done EOF diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 421809c..0000000 --- a/circle.yml +++ /dev/null @@ -1,19 +0,0 @@ -checkout: - post: - - ./ci_support/fast_finish_ci_pr_build.sh - - ./ci_support/checkout_merge_commit.sh - -machine: - services: - - docker - -dependencies: - # Note, we used to use the naive caching of docker images, but found that it was quicker - # just to pull each time. #rollondockercaching - override: - - docker pull condaforge/linux-anvil - -test: - override: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - - ./ci_support/run_docker_build.sh