This is an automated email from the ASF dual-hosted git repository. Cole-Greer pushed a commit to branch 3.8-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 5fdfe38a66edc6f0fe583744c8010c7f65f5b539 Merge: 5a7fb79a41 11cc6bfb51 Author: Cole Greer <[email protected]> AuthorDate: Tue Sep 29 14:31:06 2026 -0700 Merge branch '3.7-dev' into 3.8-dev .github/workflows/build-test.yml | 34 +++++++++--------- .github/workflows/codeql.yml | 14 ++++---- CHANGELOG.asciidoc | 2 ++ docs/src/reference/gremlin-variants.asciidoc | 5 +++ .../gremlin_python/structure/io/graphbinaryV1.py | 13 +++++++ .../python/tests/unit/io/test_graphbinaryV1.py | 40 ++++++++++++++++++++++ 6 files changed, 84 insertions(+), 24 deletions(-) diff --cc .github/workflows/build-test.yml index 51b115ce39,625245a615..168ae63536 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@@ -44,50 -38,31 +44,50 @@@ jobs runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - name: Set up JDK 11 + - name: Set up JDK 21 - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: - java-version: '11' + java-version: '21' distribution: 'temurin' + # spark-gremlin is excluded because Spark 3.3.x does not run on Java 21: its off-heap Platform initializer + # reflects on the private DirectByteBuffer(long, int) constructor that JDK 21 removed. Java 21 support arrived + # in Spark 4.0 (SPARK-43831), which requires Java 17+ and Scala 2.13, so the 3.8 line cannot adopt it. - name: Build with Maven - run: mvn clean install -pl -:gremlin-javascript,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlin-go,-:gremlin-python -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dcoverage - - name: Upload to Codecov - uses: codecov/codecov-action@v7 + run: mvn clean install -pl $EXCLUDE_MODULES,-:spark-gremlin -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + java-jdk25: + name: mvn clean install - jdk25 + timeout-minutes: 45 + needs: smoke + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - name: Set up JDK 25 + uses: actions/setup-java@v5 with: - directory: ./gremlin-tools/gremlin-coverage/target/site - java-jdk8: - name: mvn clean install - jdk8 + java-version: '25' + distribution: 'temurin' + # spark-gremlin is excluded because no Spark release TinkerPop can adopt yet supports Java 25 (Spark 4.x, which + # adds Java 25 support, requires Java 17+ and Scala 2.13). hadoop-gremlin runs on Java 25 as of Hadoop 3.4.3. + - name: Build with Maven + run: mvn clean install -pl $EXCLUDE_MODULES,-:spark-gremlin -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + java-jdk11: + name: mvn clean install - jdk11 timeout-minutes: 45 needs: smoke runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - name: Set up JDK 8 + - name: Set up JDK 11 - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: - java-version: '8' + java-version: '11' distribution: 'temurin' - name: Build with Maven - run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + run: mvn clean install -pl $EXCLUDE_MODULES -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dcoverage + - name: Upload to Codecov + uses: codecov/codecov-action@v7 + with: + directory: ./gremlin-tools/gremlin-coverage/target/site gremlin-server-default: name: gremlin-server default timeout-minutes: 45 @@@ -153,25 -128,22 +153,25 @@@ # name: ${{ github.sha }} # path: ./gremlin-server/gremlin-server.tar # retention-days: 1 - hadoop-standard: - name: hadoop standard - timeout-minutes: 45 - needs: smoke - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v7 - - name: Set up JDK 11 - uses: actions/setup-java@v6 - with: - java-version: '11' - distribution: 'temurin' - - name: Build with Maven - run: | - mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci - mvn verify -pl :hadoop-gremlin -DskipTests -DskipIntegrationTests=false '-Dit.test=HadoopGraphProcessStandardIntegrateTest' +# the hadoop-standard build runs really slowly in GHA for some reason. the command below runs in 10 minutes +# locally so not sure what's the issue is. at least hadoop-feature seems to happily run, so perhaps that is +# enough for now +# hadoop-standard: +# name: hadoop standard +# timeout-minutes: 45 +# needs: smoke +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v7 +# - name: Set up JDK 11 - # uses: actions/setup-java@v5 ++# uses: actions/setup-java@v6 +# with: +# java-version: '11' +# distribution: 'temurin' +# - name: Build with Maven +# run: | +# mvn clean install -pl $EXCLUDE_MODULES -q -DskipTests -Dci +# mvn verify -pl :hadoop-gremlin -DskipTests -DskipIntegrationTests=false '-Dit.test=HadoopGraphProcessStandardIntegrateTest' hadoop-feature: name: hadoop feature timeout-minutes: 45 diff --cc gremlin-python/src/main/python/tests/unit/io/test_graphbinaryV1.py index 6f73a74d2b,19d34f5577..ad6e5c4efe --- a/gremlin-python/src/main/python/tests/unit/io/test_graphbinaryV1.py +++ b/gremlin-python/src/main/python/tests/unit/io/test_graphbinaryV1.py @@@ -17,11 -17,13 +17,13 @@@ specific language governing permission under the License. """ -import datetime import uuid import math - + import pytest +from datetime import datetime, timedelta, timezone + from gremlin_python.statics import timestamp, long, bigint, BigDecimal, SingleByte, SingleChar, ByteBufferType +from gremlin_python.statics import long, bigint, BigDecimal, SingleByte, SingleChar, ByteBufferType, timestamp from gremlin_python.structure.graph import Vertex, Edge, Property, VertexProperty, Path from gremlin_python.structure.io.graphbinaryV1 import GraphBinaryWriter, GraphBinaryReader from gremlin_python.process.traversal import Barrier, Binding, Bytecode, Merge, Direction
