Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop using Java8 because we no longer support spark < 3.0 #5234

Merged
merged 8 commits into from Jan 7, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/cross-version-tests.yml
Expand Up @@ -103,12 +103,6 @@ jobs:
with:
repository: ${{ github.event.inputs.repository }}
ref: ${{ github.event.inputs.ref }}
- uses: actions/setup-java@v2
with:
# GitHub Actions' Ubuntu 20.04 image uses Java 11 (which is incompatible with Spark 2.4.x) by default:
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#java
java-version: 8
distribution: "adopt"
- name: Get python version
id: get-python-version
run: |
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/master.yml
Expand Up @@ -55,12 +55,6 @@ jobs:
# deleting other version(s) of JDK because they are not needed and they might interfere with JNI linker configuration in the 'setup-r' step
sudo apt-get -y remove --purge default-jdk adoptopenjdk-11-hotspot || :
- uses: actions/checkout@master
- uses: actions/setup-java@v2
with:
# GitHub Actions' Ubuntu 20.04 image uses Java 11 (which is incompatible with Spark 2.4.x) by default:
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#java
java-version: 8
distribution: 'adopt'
- name: Re-configure dynamic linker run-time bindings for adoptopenjdk-8-hotspot-amd64
run: |
sudo mkdir -p /etc/ld.so.conf.d
Expand Down Expand Up @@ -195,12 +189,6 @@ jobs:
- uses: ./.github/actions/setup-python
with:
python-version: 3.6
- uses: actions/setup-java@v2
with:
# GitHub Actions' Ubuntu 20.04 image uses Java 11 (which is incompatible with Spark 2.4.x) by default:
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#java
java-version: 8
distribution: 'adopt'
- uses: ./.github/actions/cache-pip
- name: Install dependencies
env:
Expand Down Expand Up @@ -242,11 +230,6 @@ jobs:
- uses: ./.github/actions/setup-python
with:
python-version: 3.6
- name: Set up Java
uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'adopt'
- name: Install dependencies
run: |
source ./dev/install-common-deps.sh
Expand Down Expand Up @@ -312,10 +295,6 @@ jobs:
- uses: ./.github/actions/setup-python
with:
python-version: 3.6
- uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'adopt'
- uses: ./.github/actions/cache-pip
- name: Install dependencies
env:
Expand All @@ -340,10 +319,6 @@ jobs:
- uses: ./.github/actions/setup-python
with:
python-version: 3.6
- uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'adopt'
- name: Install dependencies
env:
INSTALL_SMALL_PYTHON_DEPS: true
Expand Down Expand Up @@ -385,10 +360,6 @@ jobs:
- uses: ./.github/actions/setup-python
with:
python-version: 3.6
- uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'adopt'
- name: Install dependencies
env:
INSTALL_LARGE_PYTHON_DEPS: true
Expand Down
5 changes: 0 additions & 5 deletions mlflow/spark.py
Expand Up @@ -23,7 +23,6 @@
import posixpath
import re
import shutil
import traceback
import uuid
import yaml

Expand Down Expand Up @@ -71,10 +70,6 @@
_logger = logging.getLogger(__name__)


def _format_exception(ex):
return "".join(traceback.format_exception(type(ex), ex, ex.__traceback__))
Comment on lines -74 to -75
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed this unused function to run cross version tests for spark.



def get_default_pip_requirements():
"""
:return: A list of default pip requirements for MLflow Models produced by this flavor.
Expand Down