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/01/21 13:51:34 UTC

[tinkerpop] branch master updated (0dbab69 -> 4c4a7b6)

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 0dbab69  Merge branch '3.4-dev'
     new 999f142  Fixed python build problems given new releases to pypi
     new edc3502  Merge branch '3.3-dev' into 3.4-dev
     new 4c4a7b6  Merge branch '3.4-dev'

The 3 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:


[tinkerpop] 01/03: Fixed python build problems given new releases to pypi

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 999f142383ad4abde8c60484a3ce5c88cdefdcab
Author: stephen <sp...@gmail.com>
AuthorDate: Tue Jan 21 08:39:08 2020 -0500

    Fixed python build problems given new releases to pypi
    
    Issue were with pip and zipp both for python2 only it seems. Pinned the versions a bit better to last working versions and things seem to be building properly again. CTR
---
 gremlin-python/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index b8bf97e..4e4e991 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -314,6 +314,11 @@ limitations under the License.
                                               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&gt;=19.3.1,&lt;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 @@ limitations under the License.
                                 <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&gt;=0.5.0,&lt;1.0.0"/>
+                                        </exec>
                                         <exec executable="env/bin/python" dir="${project.build.directory}/python2"
                                               failonerror="true">
                                             <env key="PYTHONPATH" value=""/>


[tinkerpop] 02/03: Merge branch '3.3-dev' into 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 edc3502e45f7873dd9e6e46f493bdb94b4f6ba9c
Merge: 035d14b 999f142
Author: stephen <sp...@gmail.com>
AuthorDate: Tue Jan 21 08:40:33 2020 -0500

    Merge branch '3.3-dev' into 3.4-dev

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



[tinkerpop] 03/03: 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 4c4a7b6baa69942b821ac0d292c48f1eb91e5a02
Merge: 0dbab69 edc3502
Author: stephen <sp...@gmail.com>
AuthorDate: Tue Jan 21 08:51:09 2020 -0500

    Merge branch '3.4-dev'