Cleaned up the python build.
Docs were broken as a result of the jython maven plugin being disabled (it was disabled a while ago because it no longer works given authentication changes in pypi and a new plugin has not yet been released to support it). Removed some dead file coping which was no longer relevant. Included import of aenum so that docs would work - didn't seem necessary for compile. CTR
diff --git a/docs/preprocessor/awk/init-code-blocks.awk b/docs/preprocessor/awk/init-code-blocks.awk
index 4f1c184..60696fc 100644
--- a/docs/preprocessor/awk/init-code-blocks.awk
+++ b/docs/preprocessor/awk/init-code-blocks.awk
@@ -58,7 +58,7 @@
print "jython.eval('os.chdir(\"" TP_HOME "\")')"
print "jython.eval('import sys')"
print "jython.eval('sys.path.append(\"" PYTHONPATH "\")')"
- print "jython.eval('sys.path.append(\"" TP_HOME "/gremlin-python/target/test-classes/Lib\")')"
+ print "jython.eval('sys.path.append(\"" TP_HOME "/gremlin-python/target/python2/env/lib/python2.7/site-packages\")')"
print "jython.eval('from gremlin_python import statics')"
print "jython.eval('from gremlin_python.process.traversal import *')"
print "jython.eval('from gremlin_python.process.strategies import *')"
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index a1aee4a..c2ae070 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -264,29 +264,6 @@
</systemPropertyVariables>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>net.sf.mavenjython</groupId>
- <artifactId>jython-compile-maven-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>jython</goal>
- </goals>
- <configuration>
- <libraries>
- <param>aenum>=1.4.5</param>
- <param>tornado>=4.4.1</param>
- <param>six>=1.10.0</param>
- <param>futures>=3.0.5</param>
- </libraries>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
<!-- need to create python-reports directory at this point or else pytest can't write the report to it -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -301,7 +278,6 @@
<configuration>
<tasks>
<mkdir dir="${project.build.directory}/python-reports"/>
- <mkdir dir="${project.build.directory}/python/env"/>
<mkdir dir="${project.build.directory}/python-packaged/env"/>
</tasks>
</configuration>
@@ -341,7 +317,7 @@
</exec>
<exec dir="${project.build.directory}/python2" executable="env/bin/pip"
failonerror="true">
- <arg line="install wheel radish-bdd PyHamcrest"/>
+ <arg line="install wheel radish-bdd PyHamcrest aenum"/>
</exec>
<exec dir="${project.build.directory}/python3" executable="virtualenv"
failonerror="true">
@@ -349,7 +325,7 @@
</exec>
<exec dir="${project.build.directory}/python3" executable="env/bin/pip"
failonerror="true">
- <arg line="install wheel radish-bdd PyHamcrest"/>
+ <arg line="install wheel radish-bdd PyHamcrest aenum"/>
</exec>
<exec dir="${project.build.directory}/python-packaged" executable="virtualenv"
failonerror="true">
@@ -359,9 +335,6 @@
failonerror="true">
<arg line="install wheel"/>
</exec>
- <copy todir="${project.build.directory}/jython">
- <fileset dir="src/main/jython"/>
- </copy>
</tasks>
</configuration>
</execution>
@@ -376,6 +349,7 @@
<exec executable="env/bin/python" dir="${project.build.directory}/python2"
failonerror="true">
<env key="PYTHONPATH" value=""/>
+ <!-- oddly the "build-lib" needs to be in place or else docs won't generate -->
<arg line="setup.py build --build-lib ${project.build.outputDirectory}/Lib"/>
</exec>
</target>
