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 2019/07/01 22:56:31 UTC
[tinkerpop] branch master updated (e5adf47 -> 354974a)
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 e5adf47 Merge branch 'tp34'
new 6284410 Pin pytest in gremlin-console tests to avoid errors on 5.0 CTR
new 448e81e Merge branch 'tp33' into tp34
new 354974a Merge branch 'tp34'
The 3 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:
gremlin-console/src/test/python/setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 354974a5febc48aa7c17b8bbe3e892c253cbabfa
Merge: e5adf47 448e81e
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jul 1 18:56:17 2019 -0400
Merge branch 'tp34'
gremlin-console/src/test/python/setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 01/03: Pin pytest in gremlin-console tests to avoid
errors on 5.0 CTR
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 628441000d989c33c1c26ccc5a2f5e69b082012a
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jul 1 18:55:28 2019 -0400
Pin pytest in gremlin-console tests to avoid errors on 5.0 CTR
---
gremlin-console/src/test/python/setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gremlin-console/src/test/python/setup.py b/gremlin-console/src/test/python/setup.py
index a973ae5..d226fc7 100644
--- a/gremlin-console/src/test/python/setup.py
+++ b/gremlin-console/src/test/python/setup.py
@@ -29,7 +29,7 @@ setup(
'pytest-runner',
],
tests_require=[
- 'pytest',
+ 'pytest==4.6.4',
'mock',
'pexpect'
]
[tinkerpop] 02/03: Merge branch 'tp33' into tp34
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 448e81e0a6b696ec0b7059acf2009ce409d20626
Merge: 8737d6c 6284410
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jul 1 18:56:08 2019 -0400
Merge branch 'tp33' into tp34
gremlin-console/src/test/python/setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)