You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by go...@apache.org on 2019/05/22 22:55:28 UTC
[beam] 01/03: Merge pull request #8631 from
udim/datastore-version-pip-check
This is an automated email from the ASF dual-hosted git repository.
goenka pushed a commit to branch release-2.13.0
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 30a4089e7fa752c8efa12537bd2ae54eced6d3c3
Author: Udi Meiri <ud...@users.noreply.github.com>
AuthorDate: Mon May 20 18:29:45 2019 -0700
Merge pull request #8631 from udim/datastore-version-pip-check
[BEAM-7376] Update tox version used by gradle
---
buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +-
sdks/python/setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index b0794fd..64fec8d 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1645,7 +1645,7 @@ class BeamModulePlugin implements Plugin<Project> {
project.exec { commandLine virtualenvCmd }
project.exec {
executable 'sh'
- args '-c', ". ${project.ext.envdir}/bin/activate && pip install --retries 10 --upgrade tox==3.0.0 grpcio-tools==1.3.5"
+ args '-c', ". ${project.ext.envdir}/bin/activate && pip install --retries 10 --upgrade tox==3.11.1 grpcio-tools==1.3.5"
}
}
// Gradle will delete outputs whenever it thinks they are stale. Putting a
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 7915971..6ef9b7f 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -143,7 +143,7 @@ GCP_REQUIREMENTS = [
'proto-google-cloud-datastore-v1>=0.90.0,<=0.90.4; python_version < "3.0"',
# [BEAM-4543] googledatastore is not supported in Python 3.
'googledatastore>=7.0.1,<7.1; python_version < "3.0"',
- 'google-cloud-datastore>=1.7.1,<2.0.0',
+ 'google-cloud-datastore>=1.7.1,<1.8.0',
'google-cloud-pubsub>=0.39.0,<0.40.0',
# GCP packages required by tests
'google-cloud-bigquery>=1.6.0,<1.7.0',