Skip to content

Flexibility in the deps #165

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.

Sign up for GitHub

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

Merged
carsonwang merged 4 commits into from
Jul 20, 2021
Merged

Flexibility in the deps #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d35cbfa
update python deps
mjschock Jul 7, 2021
a34469e
add main to RayDP CI branches
mjschock Jul 7, 2021
b3e7135
test multiple pyspark versions
mjschock Jul 9, 2021
46d0f23
less changes
mjschock Jul 9, 2021
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
7 changes: 4 additions & 3 deletions .github/workflows/raydp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@ name: RayDP CI

on:
push:
branches: [ master ]
branches: [ main, master ]
Copy link
Collaborator

@ConeyLiu ConeyLiu Jul 8, 2021

Choose a reason for hiding this comment

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

It seems we don't have the main branch.

Copy link
Contributor Author

@mjschock mjschock Jul 8, 2021

Choose a reason for hiding this comment

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

right, i added it b/c main is now the default branch rather than master. that way the workflow runs: https://github.com/mjschock/raydp/actions/runs/1007895832

pull_request:
branches: [ master ]
branches: [ main, master ]

jobs:
build-and-test:

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 }}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.3</version>
<executions>
<execution>
<id>scala-compile-first</id>
Expand Down
6 changes: 3 additions & 3 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor Author

@mjschock mjschock Jul 9, 2021

Choose a reason for hiding this comment

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

@carsonwang - would this be alright, allowing patch changes?

Copy link
Collaborator

@carsonwang carsonwang Jul 9, 2021

Choose a reason for hiding this comment

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

Yes, looks good. Thanks!

"pyspark >= 3.0.0",
"netifaces"
]

Expand Down