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 2016/09/15 13:53:20 UTC

[2/9] tinkerpop git commit: Drop -DglvPython as a requirement for building gremlin-python.

Drop -DglvPython as a requirement for building gremlin-python.

Now you can just add .glv file to the root of gremlin-python to let Maven know that your environment is python-enabled.


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

Branch: refs/heads/master
Commit: e0d7c90d4391e24ae18fdb2cc6a57c978039b29f
Parents: fdd70e5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 14 11:59:07 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 14 11:59:07 2016 -0400

----------------------------------------------------------------------
 .gitignore                                              |  1 +
 docs/src/dev/developer/development-environment.asciidoc | 11 ++++++++++-
 gremlin-python/pom.xml                                  |  8 ++++----
 pom.xml                                                 |  1 +
 4 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9d83c5a..33fb239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ benchmarks/
 __pycache__/
 *.py[cdo]
 __version__.py
+.glv

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 117f792..632100c 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -65,6 +65,16 @@ As of TinkerPop 3.2.2, the build optionally requires link:https://www.python.org
 Java tests that require Python code will be skipped. Developers should also install link:https://pypi.python.org/pypi/pip[pip]
 and link:https://virtualenv.pypa.io/en/stable/[virtualenv].
 
+Once the Python environment is established, the full building and testing of `gremlin-python` may commence. It can be
+done manually from the command line with:
+
+[source,text]
+mvn clean install -Pglv-python
+
+which enables the "glv-python" Maven profile or in a more automated fashion simply add a `.glv` file to the root of the
+`gremlin-python` module which will signify to Maven that the environment is Python-ready. The `.glv` file need not have
+any contents and is ignored by Git. A standard `mvn clean install` will then build `gremlin-python` in full.
+
 [[release-environment]]
 Release Environment
 ~~~~~~~~~~~~~~~~~~~
@@ -117,7 +127,6 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
 ** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes`
 ** Turn off "heavy" logging in the "process" tests: `mvn clean install -DargLine="-DmuteTestLogs=true"`
 ** The test suite for `neo4j-gremlin` is disabled by default - to turn it on: `mvn clean install -DincludeNeo4j`
-** Build and execute with native Python tests (see <<python-environment,Python Environment>>: `mvn clean install -DglvPython`
 * Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory
 ** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `IoDataGenerationTest.shouldWriteGratefulDead`)
 * Check license headers are present: `mvn apache-rat:check`

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 50c823d..3695c0d 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -275,7 +275,7 @@
     </build>
 
     <profiles>
-        <!-- This default profile works around the issue where the glvPython profile which is expected to run all tests
+        <!-- This default profile works around the issue where the glv-python profile which is expected to run all tests
              can't override the exclusions defined below. -->
         <profile>
             <id>glv-python-standard</id>
@@ -307,9 +307,9 @@
             <id>glv-python</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>glvPython</name>
-                </property>
+                <file>
+                    <exists>.glv</exists>
+                </file>
             </activation>
             <build>
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fd620e7..e37746c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,6 +293,7 @@ limitations under the License.
                         <exclude>**/src/main/static/**</exclude>
                         <exclude>**/_bsp/**</exclude>
                         <exclude>DEPENDENCIES</exclude>
+                        <exclude>.glv</exclude>
                     </excludes>
                     <licenses>
                         <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>