Merge pull request apache#1082 from datastax/python-1212

aboudreault · web-flow · commit 26a6a6dab76b · 2020-05-21T07:51:29.000-04:00
PYTHON-1212: bump gremlinpython dependency to 3.4.6
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,7 @@ Bug Fixes
 Others
 ------
 * Bump geomet dependency version to 0.2 (PYTHON-1243)
+* Bump gremlinpython dependency version to 3.4.6 (PYTHON-1212)
 
 3.23.0
 ======
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -290,6 +290,11 @@ def describePerCommitStage() {
     currentBuild.displayName = "Per-Commit (${env.EVENT_LOOP_MANAGER} | ${type.capitalize()})"
     currentBuild.description = "Per-Commit build and ${type} testing of ${serverDescription} against Python v2.7.14 and v3.5.6 using ${env.EVENT_LOOP_MANAGER} event loop manager"
   }
+
+  sh label: 'Describe the python environment', script: '''#!/bin/bash -lex
+    python -V
+    pip freeze
+  '''
 }
 
 def describeScheduledTestingStage() {
@@ -623,15 +628,15 @@ pipeline {
           axis {
             name 'CASSANDRA_VERSION'
             values '3.11',    // Current Apache Cassandra
-                   'dse-6.8.0'  // Current DataStax Enterprise
+                   'dse-6.8'   // Current DataStax Enterprise
           }
           axis {
             name 'PYTHON_VERSION'
             values '2.7.14', '3.5.6'
           }
           axis {
             name 'CYTHON_ENABLED'
-            values 'False', 'True'
+            values 'False'
           }
         }
 
diff --git a/setup.py b/setup.py
@@ -410,7 +410,7 @@ def run_setup(extensions):
         dependencies.append('futures')
 
     _EXTRAS_REQUIRE = {
-        'graph': ['gremlinpython==3.3.4']
+        'graph': ['gremlinpython==3.4.6']
     }
 
     setup(
diff --git a/test-datastax-requirements.txt b/test-datastax-requirements.txt
@@ -1,3 +1,3 @@
 -r test-requirements.txt
 kerberos
-gremlinpython==3.3.4
+gremlinpython==3.4.6
diff --git a/tests/integration/simulacron/utils.py b/tests/integration/simulacron/utils.py
@@ -19,6 +19,7 @@
 
 from cassandra.metadata import SchemaParserV4, SchemaParserDSE68
 
+from tests.util import wait_until_not_raised
 from tests.integration import CASSANDRA_VERSION, SIMULACRON_JAR, DSE_VERSION
 
 DEFAULT_CLUSTER = "python_simulacron_cluster"
@@ -110,7 +111,8 @@ def submit_request(self, query):
         request.add_header("Content-Type", 'application/json')
         request.add_header("Content-Length", len(data))
 
-        connection = opener.open(request)
+        # wait that simulacron is ready and listening
+        connection = wait_until_not_raised(lambda: opener.open(request), 1, 10)
         return connection.read().decode('utf-8')
 
     def prime_server_versions(self):
diff --git a/tests/util.py b/tests/util.py
@@ -15,6 +15,7 @@
 import time
 from functools import wraps
 
+
 def wait_until(condition, delay, max_attempts):
     """
     Executes a function at regular intervals while the condition
@@ -44,22 +45,23 @@ def wait_until_not_raised(condition, delay, max_attempts):
     """
     def wrapped_condition():
         try:
-            condition()
+            result = condition()
         except:
-            return False
+            return False, None
 
-        return True
+        return True, result
 
     attempt = 0
     while attempt < (max_attempts-1):
         attempt += 1
-        if wrapped_condition():
-            return
+        success, result = wrapped_condition()
+        if success:
+            return result
 
         time.sleep(delay)
 
     # last attempt, let the exception raise
-    condition()
+    return condition()
 
 
 def late(seconds=1):

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,11 @@ def describePerCommitStage() {`
`290`	`290`	`currentBuild.displayName = "Per-Commit (${env.EVENT_LOOP_MANAGER} \| ${type.capitalize()})"`
`291`	`291`	`currentBuild.description = "Per-Commit build and ${type} testing of ${serverDescription} against Python v2.7.14 and v3.5.6 using ${env.EVENT_LOOP_MANAGER} event loop manager"`
`292`	`292`	`}`
	`293`	`+`
	`294`	`+ sh label: 'Describe the python environment', script: '''#!/bin/bash -lex`
	`295`	`+ python -V`
	`296`	`+ pip freeze`
	`297`	`+ '''`
`293`	`298`	`}`
`294`	`299`
`295`	`300`	`def describeScheduledTestingStage() {`
`@@ -623,15 +628,15 @@ pipeline {`
`623`	`628`	`axis {`
`624`	`629`	`name 'CASSANDRA_VERSION'`
`625`	`630`	`values '3.11', // Current Apache Cassandra`
`626`		`- 'dse-6.8.0' // Current DataStax Enterprise`
	`631`	`+ 'dse-6.8' // Current DataStax Enterprise`
`627`	`632`	`}`
`628`	`633`	`axis {`
`629`	`634`	`name 'PYTHON_VERSION'`
`630`	`635`	`values '2.7.14', '3.5.6'`
`631`	`636`	`}`
`632`	`637`	`axis {`
`633`	`638`	`name 'CYTHON_ENABLED'`
`634`		`- values 'False', 'True'`
	`639`	`+ values 'False'`
`635`	`640`	`}`
`636`	`641`	`}`
`637`	`642`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ def run_setup(extensions):`
`410`	`410`	`dependencies.append('futures')`
`411`	`411`
`412`	`412`	`_EXTRAS_REQUIRE = {`
`413`		`- 'graph': ['gremlinpython==3.3.4']`
	`413`	`+ 'graph': ['gremlinpython==3.4.6']`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`setup(`