From 04e441180ee31b48bf3648d9c146150e7ef04a55 Mon Sep 17 00:00:00 2001 From: semyonsinchenko Date: Wed, 24 Sep 2025 08:03:42 +0200 Subject: [PATCH] change default branch to "main" Additions: - bump dependencies - fix docs build - add docs build check to CI --- .github/workflows/python-ci.yml | 6 +++--- .github/workflows/python-publish.yml | 2 +- .github/workflows/scala-ci.yml | 10 ++++++---- .github/workflows/scala-publish.yml | 2 +- build.sbt | 4 ++-- .../scala/org/graphframes/lib/AggregateMessages.scala | 3 +-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 98a415143..62aa5befb 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -6,15 +6,15 @@ jobs: fail-fast: false matrix: include: - - spark-version: 3.5.5 + - spark-version: 3.5.6 scala-version: 2.12 python-version: "3.10" java-version: 11 - - spark-version: 4.0.0 + - spark-version: 4.0.1 scala-version: 2.13 python-version: 3.12 java-version: 17 - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest env: # define Java options for both official sbt and sbt-extras JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 5a9b2051d..660096abc 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -3,7 +3,7 @@ name: python-pypi-publish on: push: branches: - - master + - main tags: - "*.*.*" diff --git a/.github/workflows/scala-ci.yml b/.github/workflows/scala-ci.yml index 5c7a65cf5..88464fff8 100644 --- a/.github/workflows/scala-ci.yml +++ b/.github/workflows/scala-ci.yml @@ -6,13 +6,13 @@ jobs: fail-fast: false matrix: include: - - spark-version: 3.5.5 + - spark-version: 3.5.6 java-version: 11 - - spark-version: 3.5.5 + - spark-version: 3.5.6 java-version: 17 - - spark-version: 4.0.0 + - spark-version: 4.0.1 java-version: 17 - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest env: # fixing this error after tests success: sbt.ForkMain failed with exit code 134 # https://stackoverflow.com/questions/33287424/strange-exception-in-sbt-test @@ -33,6 +33,8 @@ jobs: run: build/sbt -Dspark.version=${{ matrix.spark-version }} scalafmtCheckAll - name: Check scalastyle run: build/sbt -Dspark.version=${{ matrix.spark-version }} "scalafixAll --check" + - name: Check docs build + run: build/sbt -Dspark.version=${{ matrix.spark-version }} doc - name: Build and Test run: build/sbt -v -Dspark.version=${{ matrix.spark-version }} coverage +test coverageReport - uses: codecov/codecov-action@v3 diff --git a/.github/workflows/scala-publish.yml b/.github/workflows/scala-publish.yml index 94305155a..a9b0547e1 100644 --- a/.github/workflows/scala-publish.yml +++ b/.github/workflows/scala-publish.yml @@ -3,7 +3,7 @@ name: scala-central-publish on: push: branches: - - master + - main tags: - "*.*.*" diff --git a/build.sbt b/build.sbt index d76e1616d..13561823f 100644 --- a/build.sbt +++ b/build.sbt @@ -3,12 +3,12 @@ import laika.config.SyntaxHighlighting import laika.format.Markdown.GitHubFlavor import org.typelevel.scalacoptions.ScalacOptions -lazy val sparkVer = sys.props.getOrElse("spark.version", "3.5.5") +lazy val sparkVer = sys.props.getOrElse("spark.version", "3.5.6") lazy val sparkMajorVer = sparkVer.substring(0, 1) lazy val sparkBranch = sparkVer.substring(0, 3) lazy val scalaVersions = sparkMajorVer match { case "4" => Seq("2.13.16") - case "3" => Seq("2.12.18", "2.13.16") + case "3" => Seq("2.12.20", "2.13.16") case _ => throw new IllegalArgumentException(s"Unsupported Spark version: $sparkVer.") } lazy val scalaVer = sys.props.getOrElse("scala.version", scalaVersions.head) diff --git a/core/src/main/scala/org/graphframes/lib/AggregateMessages.scala b/core/src/main/scala/org/graphframes/lib/AggregateMessages.scala index 8ed0cdb2e..494d0fb3b 100644 --- a/core/src/main/scala/org/graphframes/lib/AggregateMessages.scala +++ b/core/src/main/scala/org/graphframes/lib/AggregateMessages.scala @@ -48,8 +48,7 @@ import org.graphframes.WithIntermediateStorageLevel * - [[AggregateMessages.msg]]: message sent to vertex (for aggregation function) * * Note: If you use this operation to write an iterative algorithm, you may want to use - * [[AggregateMessages$.getCachedDataFrame getCachedDataFrame()]] as a workaround for caching - * issues. + * `checkpoint()` (`localCheckpoint()`) as a workaround for caching issues. * * @example * We can use this function to compute the in-degree of each vertex