Skip to content

Commit

Permalink
Merge pull request #2 from stuarteberg/update-to-1.6.0
Browse files Browse the repository at this point in the history
Update to 1.6.0 (and update dependencies accordingly)
  • Loading branch information
ocefpaf authored Nov 27, 2017
2 parents 3c4d5d2 + a9fd232 commit 54d0bc2
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 182 deletions.
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 @@ Summary: Python Client for Google Cloud Storage
Current build status
====================

Linux: [![Circle CI](https://circleci.com/gh/conda-forge/google-cloud-storage-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/google-cloud-storage-feedstock)
OSX: [![TravisCI](https://travis-ci.org/conda-forge/google-cloud-storage-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/google-cloud-storage-feedstock)
Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/google-cloud-storage-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/google-cloud-storage-feedstock/branch/master)
All platforms: [![Circle CI](https://circleci.com/gh/conda-forge/google-cloud-storage-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/google-cloud-storage-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.

14 changes: 8 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.1.1" %}
{% set version = "1.6.0" %}

package:
name: google-cloud-storage
Expand All @@ -7,10 +7,11 @@ package:
source:
fn: google-cloud-storage-{{ version }}.tar.gz
url: https://pypi.io/packages/source/g/google-cloud-storage/google-cloud-storage-{{ version }}.tar.gz
sha256: 11e709ed37523eb1bb68fed4dd31fb176cd7734be89cbfc5c22f1898562041bd
sha256: 939266b7d5c6df6d45a1aee2c47a09313f813e87790335f00c57708b49480054

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

requirements:
Expand All @@ -21,10 +22,11 @@ requirements:

run:
- python
- google-cloud-core >=0.24.1,<0.25dev
- google-auth >=1.0.0
- google-resumable-media ==0.0.2
- requests >=2.0.0
- google-cloud-core >=0.28.0,<0.29dev
- google-api-core >=0.1.1,<0.2.0dev
- google-auth >=1.2.0
- google-resumable-media >=0.3.1
- requests >=2.18.0

test:
imports:
Expand Down

0 comments on commit 54d0bc2

Please sign in to comment.