You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/10/29 18:17:58 UTC

[tinkerpop] branch master updated (3bef734 -> 28a3d55)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from 3bef734  Merge branch 'tp33'
     add 4d2364c  gremlin-python: g:Set graphson deserializer should return a python set
     new 79cd801  Merge branch 'pr-964' into tp33
     new 28a3d55  Merge branch 'tp33'

The 2 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:
 CHANGELOG.asciidoc                                 |  1 +
 docs/src/reference/gremlin-variants.asciidoc       |  7 ++++---
 .../gremlin_python/structure/io/graphsonV3d0.py    | 22 +++++++++++++++++-----
 .../jython/tests/structure/io/test_graphsonV3d0.py | 11 ++++++++++-
 gremlin-test/features/map/Select.feature           |  4 ++--
 5 files changed, 34 insertions(+), 11 deletions(-)


[tinkerpop] 02/02: Merge branch 'tp33'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 28a3d556d0ff769cd2712b26dbd3f6ab2618648a
Merge: 3bef734 79cd801
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Oct 29 14:17:42 2018 -0400

    Merge branch 'tp33'

 CHANGELOG.asciidoc                                 |  1 +
 docs/src/reference/gremlin-variants.asciidoc       |  7 ++++---
 .../gremlin_python/structure/io/graphsonV3d0.py    | 22 +++++++++++++++++-----
 .../jython/tests/structure/io/test_graphsonV3d0.py | 11 ++++++++++-
 gremlin-test/features/map/Select.feature           |  4 ++--
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --cc gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV3d0.py
index 5ff88d8,65e01af..f634361
--- a/gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV3d0.py
+++ b/gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV3d0.py
@@@ -28,9 -29,11 +29,11 @@@ from aenum import Enu
  
  from gremlin_python import statics
  from gremlin_python.statics import FloatType, FunctionType, IntType, LongType, TypeType, DictType, ListType, SetType
 -from gremlin_python.process.traversal import Binding, Bytecode, P, Traversal, Traverser, TraversalStrategy, T
 +from gremlin_python.process.traversal import Binding, Bytecode, P, TextP, Traversal, Traverser, TraversalStrategy, T
  from gremlin_python.structure.graph import Edge, Property, Vertex, VertexProperty, Path
  
+ log = logging.getLogger(__name__)
+ 
  # When we fall back to a superclass's serializer, we iterate over this map.
  # We want that iteration order to be consistent, so we use an OrderedDict,
  # not a dict.


[tinkerpop] 01/02: Merge branch 'pr-964' into tp33

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 79cd80197a51a9c3622f2834c93c1607fedc9a1f
Merge: aacdf7a 4d2364c
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Oct 29 14:17:36 2018 -0400

    Merge branch 'pr-964' into tp33
    
    Conflicts:
    	CHANGELOG.asciidoc

 CHANGELOG.asciidoc                                 |  1 +
 docs/src/reference/gremlin-variants.asciidoc       |  7 ++++---
 .../gremlin_python/structure/io/graphsonV3d0.py    | 22 +++++++++++++++++-----
 .../jython/tests/structure/io/test_graphsonV3d0.py | 11 ++++++++++-
 gremlin-test/features/map/Select.feature           |  4 ++--
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --cc CHANGELOG.asciidoc
index 4eba902,184c1d9..ac8cba8
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,9 -23,7 +23,10 @@@ image::https://raw.githubusercontent.co
  [[release-3-3-5]]
  === TinkerPop 3.3.5 (Release Date: NOT OFFICIALLY RELEASED YET)
  
 +This release also includes changes from <<release-3-2-11, 3.2.11>>.
 +
 +* Fixed `PersistedOutputRDD` to eager persist RDD by adding `count()` action calls.
+ * gremlin-python: the graphson deserializer for g:Set should return a python set
  
  [[release-3-3-4]]
  === TinkerPop 3.3.4 (Release Date: October 15, 2018)