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 18:56:51 UTC

[tinkerpop] branch master updated (4f36d85 -> e5adf47)

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 4f36d85  Merge branch 'tp34'
     new 264cc75  Pinned to pytest 4.6.4 as 5.0.0 seems to cause and error.
     new 8737d6c  Merge branch 'tp33' into tp34
     new e5adf47  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-python/src/main/jython/setup.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

[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 e5adf47b19987679b48fea083c2145cc77c9e038
Merge: 4f36d85 8737d6c
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jul 1 14:56:34 2019 -0400

    Merge branch 'tp34'

 gremlin-python/src/main/jython/setup.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

[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 8737d6c9c9637aacc1261a848f9f9e61ef587ff2
Merge: d2efcc6 264cc75
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jul 1 14:56:18 2019 -0400

    Merge branch 'tp33' into tp34

 gremlin-python/src/main/jython/setup.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

[tinkerpop] 01/03: Pinned to pytest 4.6.4 as 5.0.0 seems to cause and error.

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 264cc753f8bd13ca05e3da6f4c39fad2a0d19d32
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jul 1 14:54:47 2019 -0400

    Pinned to pytest 4.6.4 as 5.0.0 seems to cause and error.
    
    Going to and beyond 4.2.1 fixed the problem with more_itertools so that little workaround was removed. CTR
---
 gremlin-python/src/main/jython/setup.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gremlin-python/src/main/jython/setup.py b/gremlin-python/src/main/jython/setup.py
index d7c7b85..09b0eba 100644
--- a/gremlin-python/src/main/jython/setup.py
+++ b/gremlin-python/src/main/jython/setup.py
@@ -70,10 +70,7 @@ setup(
         'pytest-runner',
     ],
     tests_require=[
-        # more_itertools used by pytest but causes build issues given the following:
-        # https://github.com/pytest-dev/pytest/issues/4770
-        'more_itertools<6.0.0',
-        'pytest',
+        'pytest==4.6.4',
         'mock',
         'radish-bdd==0.8.6',
         'PyHamcrest'