tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [18/44] tinkerpop git commit: Improved the method for dealing with the python build problem with radish
Date Wed, 24 Jan 2018 14:54:19 GMT
Improved the method for dealing with the python build problem with radish

The issue is definitely related to the colorful version bump with radish (and PyHamcrest,
maybe others??) depend on. Rather than exclude the dependencies and manually import stuff
which was messy, David Brown suggested the fix that just involved an environment variable.
He is currently looking into opening an issue with colorful for the problem. CTR


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

Branch: refs/heads/TINKERPOP-1857
Commit: 231bbb6596646db3a6238b1014f9d43b25fc7cfd
Parents: b54c974
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Thu Jan 18 14:02:05 2018 -0500
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Thu Jan 18 14:02:05 2018 -0500

----------------------------------------------------------------------
 gremlin-python/pom.xml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/231bbb65/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index ec8a8d3..3bbf82c 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -315,27 +315,17 @@ limitations under the License.
                                               failonerror="true">
                                             <arg line="--python=python2 env"/>
                                         </exec>
-                                        <!-- temporary manual installation of deps to
hardcode colorful version given radish/PyHamcrest troubles -->
                                         <exec dir="${project.build.directory}/python2"
executable="env/bin/pip"
                                               failonerror="true">
-                                            <arg line="install wheel aenum pysingleton
humanize radish-parse_type docopt 'colorful==0.4.0' 'tag-expressions>=1.0.0'"/>
-                                        </exec>
-                                        <exec dir="${project.build.directory}/python2"
executable="env/bin/pip"
-                                              failonerror="true">
-                                            <arg line="install radish-bdd PyHamcrest --no-deps"/>
+                                            <arg line="install wheel radish-bdd PyHamcrest
aenum"/>
                                         </exec>
                                         <exec dir="${project.build.directory}/python3"
executable="virtualenv"
                                               failonerror="true">
                                             <arg line="--python=python3 env"/>
                                         </exec>
-                                        <!-- temporary manual installation of deps to
hardcode colorful version given radish/PyHamcrest troubles -->
-                                        <exec dir="${project.build.directory}/python3"
executable="env/bin/pip"
-                                              failonerror="true">
-                                            <arg line="install wheel aenum pysingleton
humanize radish-parse_type docopt 'colorful==0.4.0' 'tag-expressions>=1.0.0'"/>
-                                        </exec>
                                         <exec dir="${project.build.directory}/python3"
executable="env/bin/pip"
                                               failonerror="true">
-                                            <arg line="install radish-bdd PyHamcrest --no-deps"/>
+                                            <arg line="install wheel radish-bdd PyHamcrest
aenum"/>
                                         </exec>
                                         <exec dir="${project.build.directory}/python-packaged"
executable="virtualenv"
                                               failonerror="true">
@@ -433,6 +423,7 @@ limitations under the License.
                                         <exec executable="env/bin/radish" dir="${project.build.directory}/python2"
                                               failonerror="true">
                                             <env key="PYTHONPATH" value=""/>
+                                            <env key="PYTHONIOENCODING" value="utf-8:surrogateescape"/>
                                             <arg line="-e -t -b ${project.build.directory}/python2/radish
${project.basedir}/../gremlin-test/features/"/> <!-- -no-line-jump -->
                                         </exec>
                                     </target>


Mime
View raw message