Upgrading perfrunner python version to 3.6.12

Change-Id: I8345f345bacb2afeca076abbfbbca734d4456df2
Reviewed-on: http://review.couchbase.org/c/perfrunner/+/144305
Reviewed-by: Bo-Chun Wang <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: korry8911

Makefile

@@ -3,12 +3,15 @@ SHELL := /bin/bash
 PATH := ${GOPATH}/bin:$(PATH)
 
 ENV := env
-PYTHON := python3.5
+PYTHON := python3.6
 PYTHON_PROJECTS := cbagent perfdaily perfrunner scripts spring
-
 .PHONY: docker
 
 all:
+	export PYENV_ROOT="$$HOME/.pyenv" && \
+	export PATH="$$PYENV_ROOT/bin:$$PATH" && \
+	eval "$$(pyenv init -)" && \
+	pyenv local 3.6.12 && \
 	virtualenv --quiet --python ${PYTHON} ${ENV}
 	${ENV}/bin/pip install --upgrade --quiet pip wheel
 	${ENV}/bin/pip install --quiet --no-warn-script-location -r requirements.txt

requirements.txt

@@ -1,21 +1,21 @@
 ansible==2.5.2
-aiohttp==2.2.5
+aiohttp==3.7.3
 awscli==1.11.136
 billiard==3.5.0.2
 kombu==4.1.0
 boto3==1.4.6
 botocore==1.6.3
 celery==4.0.0
 cffi==1.7.0
-couchbase==2.5.0
+couchbase==3.0.8
 coverage==4.4.1
 cryptography==2.0.3
 decorator==4.1.2
 fabric3==1.14.post1
 flake8==3.5.0
 isort==4.3.4
 jinja2==2.9.6
-multidict==4.4.0
+multidict==5.1.0
 nose==1.3.7
 numpy==1.14.2
 paramiko==2.4.2

spring/cbgen3.py

@@ -9,10 +9,10 @@
 )
 from couchbase.management.collections import CollectionSpec
 from couchbase.management.users import User
-from txcouchbase.cluster import TxCluster
-
 from couchbase_core.cluster import PasswordAuthenticator
 from couchbase_core.views.params import ViewQuery
+from txcouchbase.cluster import TxCluster
+
 from logger import logger
 from spring.cbgen_helpers import backoff, quiet, timeit
 

spring/querygen3.py

@@ -3,9 +3,8 @@
 from typing import List, Tuple
 
 from couchbase.cluster import QueryOptions, QueryScanConsistency
-from numpy import random
-
 from couchbase_core.views.params import ViewQuery
+from numpy import random
 
 
 class ViewQueryGen3:

unittests.py

@@ -1,17 +1,22 @@
 import glob
 import json
+import pkg_resources
 from collections import defaultdict, namedtuple
 from multiprocessing import Value
 from unittest import TestCase
 
 import snappy
 
-from perfrunner.tests.analytics import BigFunQueryTest
 from perfrunner.settings import ClusterSpec, TestConfig
 from perfrunner.workloads.bigfun.query_gen import new_queries
 from perfrunner.workloads.tcmalloc import KeyValueIterator, LargeIterator
 from spring import docgen
-from spring.querygen import N1QLQueryGen
+
+cb_version = pkg_resources.get_distribution("couchbase").version
+if cb_version[0] == '2':
+    from spring.querygen import N1QLQueryGen
+elif cb_version[0] == '3':
+    from spring.querygen3 import N1QLQueryGen3 as N1QLQueryGen
 
 
 class SettingsTest(TestCase):
@@ -607,10 +612,17 @@ def test_n1ql_query_gen_q1(self):
         qg = N1QLQueryGen(queries=queries)
 
         for key in 'n1ql-0123456789', 'n1ql-9876543210':
-            query = qg.next(key, doc={})
-            self.assertEqual(query.adhoc, False)
-            self.assertEqual(query.consistency, 'not_bounded')
-            self.assertEqual(query._body['args'], [key])
+            if cb_version[0] == '3':
+                stmt, queryopts = qg.next(key, doc={})
+                self.assertEqual(queryopts['adhoc'], False)
+                self.assertEqual(str(queryopts['scan_consistency']),
+                                 'QueryScanConsistency.NOT_BOUNDED')
+                self.assertEqual(queryopts['positional_parameters'], [key])
+            else:
+                query = qg.next(key, doc={})
+                self.assertEqual(query.adhoc, False)
+                self.assertEqual(query.consistency, 'not_bounded')
+                self.assertEqual(query._body['args'], [key])
 
     def test_n1ql_query_gen_q2(self):
         queries = [{
@@ -622,9 +634,16 @@ def test_n1ql_query_gen_q2(self):
         qg = N1QLQueryGen(queries=queries)
 
         for doc in {'email': '[email protected]'}, {'email': '[email protected]'}:
-            query = qg.next(key='n1ql-0123456789', doc=doc)
-            self.assertEqual(query.consistency, 'request_plus')
-            self.assertEqual(query._body['args'], [doc['email']])
+            if cb_version[0] == '3':
+                stmt, queryopts = qg.next(key='n1ql-0123456789', doc=doc)
+                self.assertEqual(str(queryopts['scan_consistency']),
+                                 'QueryScanConsistency.REQUEST_PLUS')
+                self.assertEqual(queryopts['positional_parameters'],
+                                 [doc['email']])
+            else:
+                query = qg.next(key='n1ql-0123456789', doc=doc)
+                self.assertEqual(query.consistency, 'request_plus')
+                self.assertEqual(query._body['args'], [doc['email']])
 
 
 class BigFunTest(TestCase):