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/30 17:43:25 UTC

tinkerpop git commit: Do a safety install of whell in case virtualenv is an older version.

Repository: tinkerpop
Updated Branches:
  refs/heads/virtualenv 24eba0ca4 -> 70b34892a


Do a safety install of whell in case virtualenv is an older version.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/70b34892
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/70b34892
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/70b34892

Branch: refs/heads/virtualenv
Commit: 70b34892a0e01dac461dbaf9a12032f643ba8e6c
Parents: 24eba0c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 30 13:42:04 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 30 13:42:04 2016 -0400

----------------------------------------------------------------------
 gremlin-python/pom.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70b34892/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index bc41c57..cbee8ad 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -385,7 +385,9 @@
                                              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) -->
+                                             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}/python">
                                             <fileset dir="src/main/jython"/>
                                         </copy>
@@ -396,10 +398,18 @@
                                               failonerror="true">
                                             <arg value="env"/>
                                         </exec>
+                                        <exec dir="${project.build.directory}/python" executable="env/bin/pip"
+                                              failonerror="true">
+                                            <arg line="install wheel"/>
+                                        </exec>
                                         <exec dir="${project.build.directory}/python-packaged" executable="virtualenv"
                                               failonerror="true">
                                             <arg value="env"/>
                                         </exec>
+                                        <exec dir="${project.build.directory}/python-packaged" executable="env/bin/pip"
+                                              failonerror="true">
+                                            <arg line="install wheel"/>
+                                        </exec>
                                         <copy todir="${project.build.directory}/jython">
                                             <fileset dir="src/main/jython"/>
                                         </copy>