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 2016/08/29 21:09:46 UTC
[1/3] tinkerpop git commit: Use pytest-runner to properly build deps
on test invocation
Repository: tinkerpop
Updated Branches:
refs/heads/pytest [created] d8a6fb679
Use pytest-runner to properly build deps on test invocation
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/56737a13
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/56737a13
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/56737a13
Branch: refs/heads/pytest
Commit: 56737a134fc08e56848eed8adc61201bdd0802df
Parents: 0462430
Author: davebshow <da...@gmail.com>
Authored: Mon Aug 29 15:27:49 2016 -0400
Committer: davebshow <da...@gmail.com>
Committed: Mon Aug 29 15:27:49 2016 -0400
----------------------------------------------------------------------
gremlin-python/pom.xml | 7 +++----
gremlin-python/src/main/jython/setup.cfg | 7 +++++--
gremlin-python/src/main/jython/setup.py | 8 +++++---
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/56737a13/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index c830790..deaf17e 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -323,9 +323,8 @@
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<libraries>
- <param>aenum</param>
- <param>requests</param>
- <param>tornado</param>
+ <param>aenum==1.4.5</param>
+ <param>tornado==4.4.1</param>
</libraries>
</configuration>
</execution>
@@ -551,4 +550,4 @@ log.info("Gremlin Server shutdown")
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/56737a13/gremlin-python/src/main/jython/setup.cfg
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/setup.cfg b/gremlin-python/src/main/jython/setup.cfg
index f8bab76..d025b3a 100644
--- a/gremlin-python/src/main/jython/setup.cfg
+++ b/gremlin-python/src/main/jython/setup.cfg
@@ -17,5 +17,8 @@
[bdist_wheel]
universal=1
-[pytest]
-addopts = --junitxml=../python-reports/TEST-native-python.xml
\ No newline at end of file
+[aliases]
+test=pytest
+
+[tool:pytest]
+addopts = --junitxml=../python-reports/TEST-native-python.xml
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/56737a13/gremlin-python/src/main/jython/setup.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/setup.py b/gremlin-python/src/main/jython/setup.py
index 52e6fe4..7540654 100644
--- a/gremlin-python/src/main/jython/setup.py
+++ b/gremlin-python/src/main/jython/setup.py
@@ -64,12 +64,14 @@ setup(
long_description=open("README").read(),
test_suite="tests",
cmdclass = {'test': PyTest},
+ setup_requires=[
+ 'pytest-runner',
+ ],
tests_require=[
'pytest'
],
install_requires=[
- 'aenum',
- 'requests',
- 'tornado'
+ 'aenum==1.4.5',
+ 'tornado==4.4.1'
]
)
[2/3] tinkerpop git commit: remove unneeded custom command
Posted by sp...@apache.org.
remove unneeded custom command
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5c9d9927
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5c9d9927
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5c9d9927
Branch: refs/heads/pytest
Commit: 5c9d9927d20c7f56b9a0bc9c5c1ae0fe5a58f4bf
Parents: 56737a1
Author: davebshow <da...@gmail.com>
Authored: Mon Aug 29 15:33:51 2016 -0400
Committer: davebshow <da...@gmail.com>
Committed: Mon Aug 29 15:33:51 2016 -0400
----------------------------------------------------------------------
gremlin-python/src/main/jython/setup.py | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c9d9927/gremlin-python/src/main/jython/setup.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/setup.py b/gremlin-python/src/main/jython/setup.py
index 7540654..c37191f 100644
--- a/gremlin-python/src/main/jython/setup.py
+++ b/gremlin-python/src/main/jython/setup.py
@@ -43,17 +43,6 @@ import __version__
version = __version__.version
-class PyTest(Command):
- user_options = []
- def initialize_options(self):
- pass
- def finalize_options(self):
- pass
- def run(self):
- import sys,subprocess
- errno = subprocess.call([sys.executable, 'runtest.py'])
- raise SystemExit(errno)
-
setup(
name='gremlinpython',
version=version,
@@ -63,7 +52,6 @@ setup(
description='Gremlin-Python for Apache TinkerPop',
long_description=open("README").read(),
test_suite="tests",
- cmdclass = {'test': PyTest},
setup_requires=[
'pytest-runner',
],
[3/3] tinkerpop git commit: Merge branch 'pr-393'
Posted by sp...@apache.org.
Merge branch 'pr-393'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d8a6fb67
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d8a6fb67
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d8a6fb67
Branch: refs/heads/pytest
Commit: d8a6fb679fcb3e25d8117f6274250e741e8ae40e
Parents: b49c21d 5c9d992
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 29 15:41:23 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 29 15:41:23 2016 -0400
----------------------------------------------------------------------
gremlin-python/pom.xml | 7 +++----
gremlin-python/src/main/jython/setup.cfg | 7 +++++--
gremlin-python/src/main/jython/setup.py | 20 +++++---------------
3 files changed, 13 insertions(+), 21 deletions(-)
----------------------------------------------------------------------