Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to version 0.28.0 #5

Merged
merged 3 commits into from
Nov 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
61 changes: 0 additions & 61 deletions .travis.yml

This file was deleted.

7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
====================
Expand Down Expand Up @@ -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
===========
Expand Down Expand Up @@ -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.
74 changes: 0 additions & 74 deletions appveyor.yml

This file was deleted.

21 changes: 3 additions & 18 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
19 changes: 0 additions & 19 deletions circle.yml

This file was deleted.

16 changes: 5 additions & 11 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
Expand All @@ -12,7 +12,8 @@ source:
sha256: {{ sha256 }}

build:
number: 1
number: 0
noarch: python
script: python setup.py install --single-version-externally-managed --record record.txt

requirements:
Expand All @@ -22,14 +23,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:
Expand Down