Merge branch 'master' into anoncreds-1.0-rev-aries

baegjae · May 8, 2020 · 8035f3b · 8035f3b
2 parents 7bdc3cf + af2c2a3
commit 8035f3b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
@@ -576,7 +576,7 @@ def linuxVcxPythonTesting(env_name, network_name, testEnv) {
             echo "${env_name} Vcx Test: Test python wrapper"
 
             sh '''
-                    python3 -m pip install --user pytest==3.6.4 pytest-asyncio
+                    python3 -m pip install --user pytest==3.6.4 pytest-asyncio==0.10.0
                     LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} python3 -m pytest -s
             '''
         }
@@ -1944,4 +1944,4 @@ List<List<?>> mapToList(Map map) {
     return map.collect { it ->
         [it.key, it.value]
     }
-}
+}
diff --git a/Jenkinsfile.ci b/Jenkinsfile.ci
@@ -716,7 +716,7 @@ def linuxVcxPythonTesting(env_name, network_name, testEnv) {
             echo "${env_name} Vcx Test: Test python wrapper"
 
             sh '''
-                    python3 -m pip install --user pytest==3.6.4 pytest-asyncio
+                    python3 -m pip install --user pytest==3.6.4 pytest-asyncio==0.10.0
                     LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} python3 -m pytest -s
             '''
         }
@@ -880,4 +880,4 @@ List<List<?>> mapToList(Map map) {
     return map.collect { it ->
         [it.key, it.value]
     }
-}
+}
diff --git a/wrappers/python/setup.py b/wrappers/python/setup.py
@@ -4,7 +4,7 @@
 PKG_VERSION = os.environ.get('PACKAGE_VERSION') or '1.15.0'
 
 TEST_DEPS = [
-    'pytest<3.7', 'pytest-asyncio', 'base58'
+    'pytest<3.7', 'pytest-asyncio==0.10.0', 'base58'
 ]
 
 setup(