Skip to content

Commit ff48b7b

Browse files
authored
Flexibility in the deps (#165)
* update python deps * add main to RayDP CI branches * test multiple pyspark versions * less changes
1 parent 8d7aa58 commit ff48b7b

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/raydp.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@ name: RayDP CI
1919

2020
on:
2121
push:
22-
branches: [ master ]
22+
branches: [ main, master ]
2323
pull_request:
24-
branches: [ master ]
24+
branches: [ main, master ]
2525

2626
jobs:
2727
build-and-test:
2828

2929
strategy:
3030
matrix:
3131
os: [ ubuntu-latest, macos-latest ]
32+
pyspark-version: [3.0.0, 3.1.2]
3233
python-version: [3.6, 3.7, 3.8]
3334

3435
runs-on: ${{ matrix.os }}
@@ -51,7 +52,6 @@ jobs:
5152
if: matrix.os == 'ubuntu-latest'
5253
run: |
5354
sudo apt-get install -y mpich
54-
5555
- name: Cache pip - Ubuntu
5656
if: matrix.os == 'ubuntu-latest'
5757
uses: actions/cache@v2
@@ -87,6 +87,7 @@ jobs:
8787
env:
8888
GITHUB_CI: 1
8989
run: |
90+
pip install pyspark==${{ matrix.pyspark-version }}
9091
./build.sh
9192
pip install dist/raydp-*.whl
9293
- name: Lint

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<plugin>
153153
<groupId>net.alchim31.maven</groupId>
154154
<artifactId>scala-maven-plugin</artifactId>
155-
<version>3.2.2</version>
155+
<version>3.3.3</version>
156156
<executions>
157157
<execution>
158158
<id>scala-compile-first</id>

python/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ def run(self):
9292
install_requires = [
9393
"numpy",
9494
"typing",
95-
"pandas == 1.1.4",
95+
"pandas >= 1.1.4",
9696
"psutil",
9797
"pyarrow >= 0.10",
98-
"ray == 1.4.0",
99-
"pyspark >= 3.0.0, < 3.1.0",
98+
"ray >= 1.4.0, < 1.5.0",
99+
"pyspark >= 3.0.0",
100100
"netifaces"
101101
]
102102

0 commit comments

Comments
 (0)