diff --git a/.github/workflows/raydp.yml b/.github/workflows/raydp.yml index 25f81858..8782ccd7 100644 --- a/.github/workflows/raydp.yml +++ b/.github/workflows/raydp.yml @@ -19,9 +19,9 @@ name: RayDP CI on: push: - branches: [ master ] + branches: [ main, master ] pull_request: - branches: [ master ] + branches: [ main, master ] jobs: build-and-test: @@ -29,6 +29,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, macos-latest ] + pyspark-version: [3.0.0, 3.1.2] python-version: [3.6, 3.7, 3.8] runs-on: ${{ matrix.os }} @@ -51,7 +52,6 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | sudo apt-get install -y mpich - - name: Cache pip - Ubuntu if: matrix.os == 'ubuntu-latest' uses: actions/cache@v2 @@ -87,6 +87,7 @@ jobs: env: GITHUB_CI: 1 run: | + pip install pyspark==${{ matrix.pyspark-version }} ./build.sh pip install dist/raydp-*.whl - name: Lint diff --git a/core/pom.xml b/core/pom.xml index eda2c780..2ff89068 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -152,7 +152,7 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 + 3.3.3 scala-compile-first diff --git a/python/setup.py b/python/setup.py index 54026875..1484a2cc 100644 --- a/python/setup.py +++ b/python/setup.py @@ -92,11 +92,11 @@ def run(self): install_requires = [ "numpy", "typing", - "pandas == 1.1.4", + "pandas >= 1.1.4", "psutil", "pyarrow >= 0.10", - "ray == 1.4.0", - "pyspark >= 3.0.0, < 3.1.0", + "ray >= 1.4.0, < 1.5.0", + "pyspark >= 3.0.0", "netifaces" ]