From a02ad67ed24d61cfb4a62d52b86fc5ffad33c115 Mon Sep 17 00:00:00 2001 From: Brent Dorsey Date: Mon, 15 Apr 2019 11:54:38 -0500 Subject: [PATCH] updating pull request with suggested changes inserting space between package and verion in requirements sections removing unused packages from test.requires refactored grpcio package version requirement to use Jinja templating inserted into .gitignore to exclude Intellij IDEA project module definition files --- .gitignore | 1 + .../meta.yaml | 25 +++++++------------ recipes/grpcio-gcp-feedstock/meta.yaml | 4 +-- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 95160e011..5ea551e9b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ __pycache__ # Editor files *.swp .idea +*.iml diff --git a/recipes/google-cloud-container-feedstock/meta.yaml b/recipes/google-cloud-container-feedstock/meta.yaml index 9916a52c3..eca51080c 100644 --- a/recipes/google-cloud-container-feedstock/meta.yaml +++ b/recipes/google-cloud-container-feedstock/meta.yaml @@ -20,29 +20,22 @@ requirements: - pip run: - python - - google-api-core>=1.6.0,<2.0.0dev - - grpcio>=1.8.2 - - googleapis-common-protos>=1.5.3,!=1.5.4,<2.0dev - - protobuf>=3.4.0 - - google-auth>=0.4.0,<2.0dev - - requests>=2.18.0,<3.0.0dev - - setuptools>=34.0.0 - - six>=1.10.0 + - google-api-core >=1.6.0,<2.0.0dev + - grpcio >=1.8.2 + - googleapis-common-protos >=1.5.3,!=1.5.4,<2.0dev + - protobuf >=3.4.0 + - google-auth >=0.4.0,<2.0dev + - requests >=2.18.0,<3.0.0dev + - setuptools >=34.0.0 + - six >=1.10.0 - pytz - - futures>=3.0.5 + - futures >=3.0.5 test: imports: - google.cloud - google.cloud.container_v1 - google.cloud.container_v1.proto - requires: - - coverage - - docutils - - flake8 - - mock - - pytest - - pytest-cov about: home: https://github.com/googleapis/google-cloud-python/tree/master/container diff --git a/recipes/grpcio-gcp-feedstock/meta.yaml b/recipes/grpcio-gcp-feedstock/meta.yaml index dba2c3aa7..f344126b1 100644 --- a/recipes/grpcio-gcp-feedstock/meta.yaml +++ b/recipes/grpcio-gcp-feedstock/meta.yaml @@ -20,9 +20,9 @@ requirements: - pip run: - python - - grpcio>=0.2.2 # must equal grpcio-gcp version + - grpcio >={{ version }} - grpcio-tools - - protobuf>=3.6.1 + - protobuf >=3.6.1 test: imports: -- GitLab