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.

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

Jump to bottom

Switch to Ray from conda-forge #2562

Merged
merged 2 commits into from
Dec 18, 2020
Merged

Switch to Ray from conda-forge #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61df98a
FIX-#2561: Switch to Ray from conda-forge, abandon pip caching
vnlitvinov Dec 18, 2020
9428b14
FIX-#2561: Remove pip caching from push CI actions
vnlitvinov Dec 18, 2020
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
85 changes: 0 additions & 85 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,47 +67,13 @@ jobs:
- run: pip install flake8 flake8-print
- run: flake8 --enable=T modin

prepare-cache:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["ubuntu-latest", "windows-latest"]
python-version: ["3.6", "3.7", "3.8"]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip if Ubuntu
if: startsWith(runner.os, 'Linux')
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- name: Cache pip if Windows
if: startsWith(runner.os, 'Windows')
uses: actions/cache@v1
with:
path: ~\AppData\Local\pip\Cache
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: actions/setup-python@v2
with:
python-version: ${{matrix.python-version}}
architecture: "x64"
- run: pip install "ray>=1.0.0"

test-api:
needs: prepare-cache
runs-on: ubuntu-latest
name: test api
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand All @@ -130,18 +96,12 @@ jobs:
run: python -m pytest modin/test/test_backends_api.py

test-headers:
needs: prepare-cache
runs-on: ubuntu-latest
name: test-headers
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand All @@ -166,11 +126,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -209,11 +164,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -276,11 +226,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- name: Setting up Modin environment
uses: conda-incubator/setup-miniconda@v2
with:
Expand Down Expand Up @@ -313,11 +258,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -372,11 +312,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -440,11 +375,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -478,11 +408,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -516,11 +441,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~\AppData\Local\pip\Cache
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -601,11 +521,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down
64 changes: 0 additions & 64 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,13 @@
name: master
on: push
jobs:
prepare-cache:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["ubuntu-latest", "windows-latest"]
python-version: ["3.6", "3.7", "3.8"]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip if Ubuntu
if: startsWith(runner.os, 'Linux')
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- name: Cache pip if Windows
if: startsWith(runner.os, 'Windows')
uses: actions/cache@v1
with:
path: ~\AppData\Local\pip\Cache
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: actions/setup-python@v2
with:
python-version: ${{matrix.python-version}}
architecture: "x64"
- run: pip install "ray>=1.0.0"

test-internals:
needs: prepare-cache
runs-on: ubuntu-latest
name: test-internals
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand All @@ -65,7 +31,6 @@ jobs:
run: python -m pytest modin/test/backends/pandas/test_internals.py

test-defaults:
needs: prepare-cache
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -78,11 +43,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -131,7 +91,6 @@ jobs:
run: bash <(curl -s https://codecov.io/bash)

test-omnisci:
needs: prepare-cache
runs-on: ubuntu-latest
env:
MODIN_MEMORY: 1000000000
Expand All @@ -143,11 +102,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- name: Setting up Modin environment
uses: conda-incubator/setup-miniconda@v2
with:
Expand All @@ -169,7 +123,6 @@ jobs:
run: bash <(curl -s https://codecov.io/bash)

test-all:
needs: prepare-cache
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -183,11 +136,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -240,7 +188,6 @@ jobs:
run: bash <(curl -s https://codecov.io/bash)

test-windows:
needs: prepare-cache
runs-on: windows-latest
strategy:
matrix:
Expand All @@ -255,11 +202,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~\AppData\Local\pip\Cache
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down Expand Up @@ -327,7 +269,6 @@ jobs:
run: codecov -f ./coverage.xml

test-pyarrow:
needs: prepare-cache
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -340,11 +281,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: modin
Expand Down
3 changes: 1 addition & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,4 @@ dependencies:
- cloudpickle==1.4.1
- boto3
- asv
- pip:
- ray>=1.0.0
- ray-core >=1.0.0
3 changes: 1 addition & 2 deletions requirements/env_omnisci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ dependencies:
- pygithub==1.53
- omniscidbe4py
- s3fs>=0.4.2
- pip:
- ray>=1.0.0
- ray-core >=1.0.0