Repository: tinkerpop Updated Branches: refs/heads/master d67b2abf7 -> 19a211b33
Fixed build problems with python given dep issues with radish Radish uses colorful which just bumped version and ends up breaking something in radish. Manually loaded deps for now until that is resolved in radish. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b54c9740 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b54c9740 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b54c9740 Branch: refs/heads/master Commit: b54c9740ae1efd08b0a26b780ee109641728b9e8 Parents: 7b37a25 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Jan 18 07:10:04 2018 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Jan 18 07:10:04 2018 -0500 ---------------------------------------------------------------------- gremlin-python/pom.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b54c9740/gremlin-python/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index c6373bd..ec8a8d3 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -315,17 +315,27 @@ 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 radish-bdd PyHamcrest aenum"/> + <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"/> </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 wheel radish-bdd PyHamcrest aenum"/> + <arg line="install radish-bdd PyHamcrest --no-deps"/> </exec> <exec dir="${project.build.directory}/python-packaged" executable="virtualenv" failonerror="true">
