Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/production-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
description: "Git tag for release"
required: true
spark-version:
description: "Spark version (3.5.1 for Spark 3 release, 4.1.0 for Spark 4 release)"
description: "Spark version (3.5.8 for Spark 3 release, 4.1.0 for Spark 4 release)"
default: "3.5.1"
java-version:
description: "Java version (8 for Spark 3, 17 for Spark 4)"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
description: "Git tag for release"
required: true
spark-version:
description: "Spark version to build against. Use 3.5.1 for Spark 3 release, 4.1.0 for Spark 4 release."
description: "Spark version to build against. Use 3.5.8 for Spark 3 release, 4.1.0 for Spark 4 release."
default: "3.5.1"
scala-version:
description: "Scala version. Use 2.12.19 for Spark 3, 2.13.14 for Spark 4."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
shell: bash -el {0}
strategy:
matrix:
spark_version: [3.4.1, 3.5.1]
spark_version: [3.4.1, 3.5.8]
scala_version: [2.12.19]
env:
SPARK_VERSION: ${{ matrix.spark_version }}
Expand Down
11 changes: 7 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import sbt.nio.Keys._
lazy val scala212 = "2.12.19"
lazy val scala213 = "2.13.15"

lazy val spark3 = "3.5.1"
lazy val spark3 = "3.5.8"
lazy val spark4 = "4.1.0"

lazy val sparkVersion = settingKey[String]("sparkVersion")
Expand Down Expand Up @@ -122,7 +122,10 @@ lazy val commonSettings = Seq(
assembly / assemblyMergeStrategy := {
case p if p.toLowerCase.contains("manifest.mf") =>
MergeStrategy.discard
case p if p.toLowerCase.endsWith(".sf") || p.toLowerCase.endsWith(".dsa") || p.toLowerCase.endsWith(".rsa") =>
case p
if p.toLowerCase.endsWith(".sf") || p.toLowerCase.endsWith(".dsa") || p
.toLowerCase
.endsWith(".rsa") =>
MergeStrategy.discard
case p if p.startsWith("com/fasterxml/jackson/") =>
MergeStrategy.discard
Expand All @@ -140,7 +143,7 @@ lazy val commonSettings = Seq(
if (sparkVersion.value.contains("SNAPSHOT"))
Seq("Apache Snapshots" at "https://repository.apache.org/snapshots/")
else Seq.empty
},
}
)

lazy val functionsYml = settingKey[File]("functionsYml")
Expand Down Expand Up @@ -206,7 +209,7 @@ ThisBuild / coreDependencies := {
// against the same ABI Spark itself was compiled against (avoids NoSuchMethod
// style runtime breaks). Verified against the Spark POMs:
// - Spark 4.1.0: netty.version = 4.2.7.Final (Spark 4.0.0 used 4.1.118; 4.1 bumped to the 4.2 line)
// - Spark 3.5.1: netty 4.1.96.Final
// - Spark 3.5.8: netty 4.1.96.Final
val hadoopVersion = if (sparkMajor == "3") "3.3.6" else "3.4.2"
val nettyVersion = if (sparkMajor == "3") "4.1.96.Final" else "4.2.7.Final"
val avroVersion = if (sparkMajor == "3") "1.11.4" else "1.12.0"
Expand Down
2 changes: 1 addition & 1 deletion python/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- typeguard
- yapf=0.40.1
- pip:
- pyspark==3.5.1
- pyspark==3.5.8
- databricks-cli==0.18 # Docs notebook source generation
- databricks-sdk
- setuptools==65.6.3 # Python packaging
Expand Down
Loading