You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ly...@apache.org on 2022/06/10 19:28:55 UTC
[tinkerpop] branch 3.6-dev updated (f204c65367 -> f3b1dfeace)
This is an automated email from the ASF dual-hosted git repository.
lyndonb pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from f204c65367 Merge branch '3.5-dev' into 3.6-dev
add 1e6717ab1d TINKERPOP-2749: Spark Gremlin Windows Build Error Fixes (#1681)
add 1b5e41c567 TINKERPOP-2631 - Specify ujson version of 2.0.0 or greater (#1682)
add eea47e1c62 updated the gremlin.go file to match compilation from updated go translator (#1694)
add eba3b29b4a removed call to open() in connection constructor and added console warning to users, added changelog and upgrade docs. (#1680)
new f3b1dfeace Merging '3.5-dev' into 3.6-dev
The 1 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:
.github/workflows/build-test.yml | 24 ++++++++++++++++++----
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.5.x.asciidoc | 14 +++++++++++++
.../javascript/gremlin-javascript/.eslintrc.js | 1 +
.../gremlin-javascript/lib/driver/connection.js | 8 +++++---
.../main/python/gremlin_python/driver/protocol.py | 5 -----
.../python/gremlin_python/driver/serializer.py | 10 ++++++---
gremlin-python/src/main/python/setup.py | 5 +++--
.../structure/io/AbstractIoRegistryCheck.java | 6 +++---
9 files changed, 54 insertions(+), 20 deletions(-)
[tinkerpop] 01/01: Merging '3.5-dev' into 3.6-dev
Posted by ly...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lyndonb pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit f3b1dfeacefd13e1236ffab1427f2c7756889815
Merge: f204c65367 eba3b29b4a
Author: Lyndon Bauto <ly...@bitquilltech.com>
AuthorDate: Fri Jun 10 12:28:24 2022 -0700
Merging '3.5-dev' into 3.6-dev
.github/workflows/build-test.yml | 24 ++++++++++++++++++----
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.5.x.asciidoc | 14 +++++++++++++
.../javascript/gremlin-javascript/.eslintrc.js | 1 +
.../gremlin-javascript/lib/driver/connection.js | 8 +++++---
.../main/python/gremlin_python/driver/protocol.py | 5 -----
.../python/gremlin_python/driver/serializer.py | 10 ++++++---
gremlin-python/src/main/python/setup.py | 5 +++--
.../structure/io/AbstractIoRegistryCheck.java | 6 +++---
9 files changed, 54 insertions(+), 20 deletions(-)
diff --cc gremlin-python/src/main/python/gremlin_python/driver/protocol.py
index 39aafe9cfc,735f0ecd19..27617c2ab2
--- a/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
@@@ -22,12 -22,8 +22,7 @@@ import base6
import struct
# import kerberos Optional dependency imported in relevant codeblock
-import six
- try:
- import ujson as json
- except ImportError:
- import json
-
from gremlin_python.driver import request
from gremlin_python.driver.resultset import ResultSet
diff --cc gremlin-python/src/main/python/setup.py
index 57cd3a6874,acfd8055ac..cbc9f4005a
--- a/gremlin-python/src/main/python/setup.py
+++ b/gremlin-python/src/main/python/setup.py
@@@ -73,13 -74,14 +73,14 @@@ setup
],
tests_require=[
'pytest>=4.6.4,<7.2.0',
- 'mock>=3.0.5,<4.0.0',
- 'radish-bdd==0.8.6',
- 'PyHamcrest>=1.9.0,<2.0.0'
+ 'mock>=3.0.5,<5.0.0',
+ 'radish-bdd==0.13.4',
+ 'PyHamcrest>=1.9.0,<3.0.0'
],
install_requires=install_requires,
- extra_require={
- 'kerberos': 'kerberos>=1.3.0,<2.0.0' # Does not install in Microsoft Windows
+ extras_require={
+ 'kerberos': 'kerberos>=1.3.0,<2.0.0', # Does not install in Microsoft Windows
+ 'ujson': 'ujson>=2.0.0'
},
classifiers=[
"Intended Audience :: Developers",