Merge branch '3.3-dev' into 3.4-dev
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index a30cae9..346abd0 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -314,6 +314,11 @@
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"/>
@@ -408,6 +413,11 @@
<configuration>
<skip>${skipTests}</skip>
<target>
+ <!-- setup.py seems to have troubles with the recently published zipp 1.0.0 -->
+ <exec dir="${project.build.directory}/python2" executable="env/bin/python"
+ failonerror="true">
+ <arg line="-m pip install zipp>=0.5.0,<1.0.0"/>
+ </exec>
<exec executable="env/bin/python" dir="${project.build.directory}/python2"
failonerror="true">
<env key="PYTHONPATH" value=""/>