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 2020/02/19 17:20:06 UTC
[tinkerpop] branch master updated (8feb3ae -> c3b07a8)
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 8feb3ae Merge branch '3.4-dev'
add 9c829ca Fixed docker build in travis
add 5e54a70 Merge branch '3.3-dev' into 3.4-dev
new c3b07a8 Merge branch '3.4-dev'
The 1 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:
docker/Dockerfile | 2 +-
gremlin-python/pom.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
[tinkerpop] 01/01: Merge branch '3.4-dev'
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 c3b07a8a365e0fb3dbb8fe344aa8c10c67c6bb79
Merge: 8feb3ae 5e54a70
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Feb 19 12:19:49 2020 -0500
Merge branch '3.4-dev'
docker/Dockerfile | 2 +-
gremlin-python/pom.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --cc gremlin-python/pom.xml
index 2e061b8,dab1c9b..89b9e6c
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@@ -111,16 -293,49 +111,24 @@@ limitations under the License
<configuration>
<tasks>
<!-- seems like we need a few different copies of the same source. all the
- different python/jython stuff doesn't seem to want to share. we use
- /python for basic tests and stuff, /jython for jython compilation with
- the jython plugin, /python-packaged for distribution tasks. some of the
- problem seems to stem from the python lifecycle not binding perfectly well
- to the maven lifecycle (integration tests seems to cause troubles
- specifically). note that the commands to install wheel are largely for
- safety in case someone is using an older version of virtualenv (which
- doesn't install wheel by default) -->
+ different python stuff doesn't seem to want to share. we use
+ /python3 for basic tests and stuff and /python-packaged for distribution
+ tasks. some of the problem seems to stem from the python lifecycle not
+ binding perfectly well to the maven lifecycle (integration tests seems to
+ cause troubles specifically). note that the commands to install wheel are
+ largely for safety in case someone is using an older version of virtualenv
+ (which doesn't install wheel by default) -->
<copy todir="${project.build.directory}/python3">
- <fileset dir="src/main/jython"/>
- </copy>
- <copy todir="${project.build.directory}/python2">
- <fileset dir="src/main/jython"/>
+ <fileset dir="src/main/python"/>
</copy>
- <copy todir="${project.build.directory}/python-packaged">
- <fileset dir="src/main/jython"/>
- </copy>
- <!-- print versions of python and virtualenv -->
- <exec dir="${project.build.directory}/python2" executable="python2"
- failonerror="true">
- <arg line="--version"/>
- </exec>
- <exec dir="${project.build.directory}/python2" executable="python3"
++ <exec dir="${project.build.directory}/python3" executable="python3"
+ failonerror="true">
+ <arg line="--version"/>
+ </exec>
- <exec dir="${project.build.directory}/python2" executable="virtualenv"
++ <exec dir="${project.build.directory}/python3" executable="virtualenv"
+ failonerror="true">
+ <arg line="--version"/>
+ </exec>
- <exec dir="${project.build.directory}/python2" executable="virtualenv"
- failonerror="true">
- <arg line="--python=python2 env"/>
- </exec>
- <!-- pip 20 doesn't work with python 2 it seems -->
- <exec dir="${project.build.directory}/python2" executable="env/bin/python"
- failonerror="true">
- <arg line="-m pip install pip>=19.3.1,<20.0.0"/>
- </exec>
- <exec dir="${project.build.directory}/python2" executable="env/bin/pip"
- failonerror="true">
- <arg line="install wheel radish-bdd PyHamcrest aenum isodate"/>
- </exec>
<exec dir="${project.build.directory}/python3" executable="virtualenv"
failonerror="true">
<arg line="--python=python3 env"/>