Skip to content
Merged
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
24 changes: 13 additions & 11 deletions .github/workflows/python-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,41 @@ jobs:
fail-fast: false
matrix:
include:
- spark-version: 3.3.0
- spark-version: 3.3.2
scala-version: 2.12.12
- spark-version: 3.2.2
python-version: 3.9
- spark-version: 3.2.3
scala-version: 2.12.12
python-version: 3.9
- spark-version: 3.1.3
scala-version: 2.12.12
python-version: 3.8
python-version: 3.9
- spark-version: 3.0.3
scala-version: 2.12.12
python-version: 3.8
runs-on: ubuntu-20.04
python-version: 3.9
runs-on: ubuntu-22.04
env:
# define Java options for both official sbt and sbt-extras
JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
SPARK_VERSION: ${{ matrix.spark-version }}
SCALA_VERSION: ${{ matrix.scala-version }}
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: olafurpg/setup-scala@v13
with:
java-version: "zulu@1.8"
- uses: actions/cache@v2
java-version: "openjdk@1.11"
- uses: actions/cache@v3
with:
path: |
~/.ivy2/cache
key: sbt-ivy-cache-spark-${{ matrix.spark-version}}-scala-${{ matrix.scala-version }}
- name: Assembly
run: sbt -v ++${{ matrix.scala-version }} -Dspark.version=${{ matrix.spark-version }} "set test in assembly := {}" assembly
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Python depencencies
- name: Install python dependencies
run: |
python -m pip install --upgrade pip wheel
pip install -r ./python/requirements.txt
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/scala-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@ jobs:
fail-fast: false
matrix:
include:
- spark-version: 3.3.0
- spark-version: 3.3.2
scala-version: 2.12.12
- spark-version: 3.2.2
- spark-version: 3.2.3
scala-version: 2.12.12
- spark-version: 3.1.3
scala-version: 2.12.12
- spark-version: 3.0.3
scala-version: 2.12.12
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
# define Java options for both official sbt and sbt-extras
JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: olafurpg/setup-scala@v13
with:
java-version: "zulu@1.8"
- uses: actions/cache@v2
java-version: "openjdk@1.11"
- uses: actions/cache@v3
with:
path: |
~/.ivy2/cache
key: sbt-ivy-cache-spark-${{ matrix.spark-version}}-scala-${{ matrix.scala-version }}
- name: Build and Test
run: sbt -v ++${{ matrix.scala-version }} -Dspark.version=${{ matrix.spark-version }} coverage test coverageReport
- uses: codecov/codecov-action@v2
- uses: codecov/codecov-action@v3
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

ARG PYTHON_VERSION=3.8
ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -9,7 +9,7 @@ RUN apt-get update && \

# Install Spark and update env variables.
ENV SCALA_VERSION 2.12.15
ENV SPARK_VERSION "3.3.0"
ENV SPARK_VERSION "3.3.2"
ENV SPARK_BUILD "spark-${SPARK_VERSION}-bin-hadoop3.2"
ENV SPARK_BUILD_URL "https://dist.apache.org/repos/dist/release/spark/spark-${SPARK_VERSION}/${SPARK_BUILD}.tgz"
RUN wget --quiet "$SPARK_BUILD_URL" -O /tmp/spark.tgz && \
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ReleaseTransformations._

resolvers += "Spark snapshot repository" at "https://repository.apache.org/snapshots/"

val sparkVer = sys.props.getOrElse("spark.version", "3.3.0")
val sparkVer = sys.props.getOrElse("spark.version", "3.3.2")
val sparkBranch = sparkVer.substring(0, 3)
val defaultScalaVer = sparkBranch match {
case "3.3" => "2.12.15"
Expand Down
2 changes: 1 addition & 1 deletion dev/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def verify(prompt, interactive):
@click.option("--publish-docs", type=bool, default=PUBLISH_DOCS_DEFAULT, show_default=True,
help="Publish docs to github-pages.")
@click.option("--spark-version", multiple=True, show_default=True,
default=["3.0.3", "3.1.3", "3.2.2", "3.3.0"])
default=["3.0.3", "3.1.3", "3.2.3", "3.3.2"])
def main(release_version, next_version, publish_to, no_prompt, git_remote, publish_docs,
spark_version):
interactive = not no_prompt
Expand Down
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This file should list any python package dependencies.
nose==1.3.3
nose==1.3.7
numpy>=1.7