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:27 UTC
[beam] branch release-2.13.0 updated (c6b0250 -> ee91a25)
This is an automated email from the ASF dual-hosted git repository.
goenka pushed a change to branch release-2.13.0
in repository https://gitbox.apache.org/repos/asf/beam.git.
omit c6b0250 Merge pull request #8631 from udim/datastore-version-pip-check
omit aa67310 [Gradle Release Plugin] - new version commit: 'v2.13.0-SNAPSHOT'.
omit 868db1c [Gradle Release Plugin] - pre tag commit: 'v2.13.0-RC1'.
omit 682144e Merge pull request #8638: [release-2.13.0][BEAM-7230] Make PoolableDataSourceProvider a static singleton
new 30a4089 Merge pull request #8631 from udim/datastore-version-pip-check
new 01e252d [Gradle Release Plugin] - pre tag commit: 'v2.13.0-RC1'.
new ee91a25 [Gradle Release Plugin] - new version commit: 'v2.13.0-SNAPSHOT'.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c6b0250)
\
N -- N -- N refs/heads/release-2.13.0 (ee91a25)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[beam] 02/03: [Gradle Release Plugin] - pre tag commit:
'v2.13.0-RC1'.
Posted by go...@apache.org.
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 01e252d0cad9a7286662417b09aff0549d52c5ff
Author: Ankur Goenka <an...@gmail.com>
AuthorDate: Tue May 21 14:30:10 2019 -0700
[Gradle Release Plugin] - pre tag commit: 'v2.13.0-RC1'.
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index dddeac9..793899a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,4 +23,4 @@ offlineRepositoryRoot=offline-repository
signing.gnupg.executable=gpg
signing.gnupg.useLegacyGpg=true
-version=2.13.0-SNAPSHOT
+version=2.13.0-RC1
[beam] 01/03: Merge pull request #8631 from
udim/datastore-version-pip-check
Posted by go...@apache.org.
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',
[beam] 03/03: [Gradle Release Plugin] - new version commit:
'v2.13.0-SNAPSHOT'.
Posted by go...@apache.org.
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 ee91a25d0cb4c534aa261350a91cd00db2b7fbad
Author: Ankur Goenka <an...@gmail.com>
AuthorDate: Tue May 21 14:30:10 2019 -0700
[Gradle Release Plugin] - new version commit: 'v2.13.0-SNAPSHOT'.
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 793899a..dddeac9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,4 +23,4 @@ offlineRepositoryRoot=offline-repository
signing.gnupg.executable=gpg
signing.gnupg.useLegacyGpg=true
-version=2.13.0-RC1
+version=2.13.0-SNAPSHOT