Skip to content

Commit c5aac3e

Browse files
vnlitvinovvnlitvinov
authored
Switch to Ray from conda-forge (#2562)
* FIX-#2561: Switch to Ray from conda-forge, abandon pip caching Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com> * FIX-#2561: Remove pip caching from push CI actions Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
1 parent 43df818 commit c5aac3e

File tree

4 files changed

+2
-153
lines changed

4 files changed

+2
-153
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -67,47 +67,13 @@ jobs:
6767
- run: pip install flake8 flake8-print
6868
- run: flake8 --enable=T modin
6969

70-
prepare-cache:
71-
runs-on: ${{ matrix.os }}
72-
strategy:
73-
matrix:
74-
os: ["ubuntu-latest", "windows-latest"]
75-
python-version: ["3.6", "3.7", "3.8"]
76-
steps:
77-
- uses: actions/checkout@v2
78-
with:
79-
fetch-depth: 1
80-
- name: Cache pip if Ubuntu
81-
if: startsWith(runner.os, 'Linux')
82-
uses: actions/cache@v1
83-
with:
84-
path: ~/.cache/pip
85-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
86-
- name: Cache pip if Windows
87-
if: startsWith(runner.os, 'Windows')
88-
uses: actions/cache@v1
89-
with:
90-
path: ~\AppData\Local\pip\Cache
91-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
92-
- uses: actions/setup-python@v2
93-
with:
94-
python-version: ${{matrix.python-version}}
95-
architecture: "x64"
96-
- run: pip install "ray>=1.0.0"
97-
9870
test-api:
99-
needs: prepare-cache
10071
runs-on: ubuntu-latest
10172
name: test api
10273
steps:
10374
- uses: actions/checkout@v2
10475
with:
10576
fetch-depth: 1
106-
- name: Cache pip
107-
uses: actions/cache@v1
108-
with:
109-
path: ~/.cache/pip
110-
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
11177
- uses: conda-incubator/setup-miniconda@v2
11278
with:
11379
activate-environment: modin
@@ -130,18 +96,12 @@ jobs:
13096
run: python -m pytest modin/test/test_backends_api.py
13197

13298
test-headers:
133-
needs: prepare-cache
13499
runs-on: ubuntu-latest
135100
name: test-headers
136101
steps:
137102
- uses: actions/checkout@v2
138103
with:
139104
fetch-depth: 1
140-
- name: Cache pip
141-
uses: actions/cache@v1
142-
with:
143-
path: ~/.cache/pip
144-
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
145105
- uses: conda-incubator/setup-miniconda@v2
146106
with:
147107
activate-environment: modin
@@ -166,11 +126,6 @@ jobs:
166126
- uses: actions/checkout@v2
167127
with:
168128
fetch-depth: 1
169-
- name: Cache pip
170-
uses: actions/cache@v1
171-
with:
172-
path: ~/.cache/pip
173-
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
174129
- uses: conda-incubator/setup-miniconda@v2
175130
with:
176131
activate-environment: modin
@@ -209,11 +164,6 @@ jobs:
209164
- uses: actions/checkout@v2
210165
with:
211166
fetch-depth: 1
212-
- name: Cache pip
213-
uses: actions/cache@v1
214-
with:
215-
path: ~/.cache/pip
216-
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
217167
- uses: conda-incubator/setup-miniconda@v2
218168
with:
219169
activate-environment: modin
@@ -276,11 +226,6 @@ jobs:
276226
- uses: actions/checkout@v2
277227
with:
278228
fetch-depth: 1
279-
- name: Cache pip
280-
uses: actions/cache@v1
281-
with:
282-
path: ~/.cache/pip
283-
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
284229
- name: Setting up Modin environment
285230
uses: conda-incubator/setup-miniconda@v2
286231
with:
@@ -313,11 +258,6 @@ jobs:
313258
- uses: actions/checkout@v2
314259
with:
315260
fetch-depth: 1
316-
- name: Cache pip
317-
uses: actions/cache@v1
318-
with:
319-
path: ~/.cache/pip
320-
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
321261
- uses: conda-incubator/setup-miniconda@v2
322262
with:
323263
activate-environment: modin
@@ -372,11 +312,6 @@ jobs:
372312
- uses: actions/checkout@v2
373313
with:
374314
fetch-depth: 1
375-
- name: Cache pip
376-
uses: actions/cache@v1
377-
with:
378-
path: ~/.cache/pip
379-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
380315
- uses: conda-incubator/setup-miniconda@v2
381316
with:
382317
activate-environment: modin
@@ -440,11 +375,6 @@ jobs:
440375
- uses: actions/checkout@v2
441376
with:
442377
fetch-depth: 1
443-
- name: Cache pip
444-
uses: actions/cache@v1
445-
with:
446-
path: ~/.cache/pip
447-
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
448378
- uses: conda-incubator/setup-miniconda@v2
449379
with:
450380
activate-environment: modin
@@ -478,11 +408,6 @@ jobs:
478408
- uses: actions/checkout@v2
479409
with:
480410
fetch-depth: 1
481-
- name: Cache pip
482-
uses: actions/cache@v1
483-
with:
484-
path: ~/.cache/pip
485-
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
486411
- uses: conda-incubator/setup-miniconda@v2
487412
with:
488413
activate-environment: modin
@@ -516,11 +441,6 @@ jobs:
516441
- uses: actions/checkout@v2
517442
with:
518443
fetch-depth: 1
519-
- name: Cache pip
520-
uses: actions/cache@v1
521-
with:
522-
path: ~\AppData\Local\pip\Cache
523-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
524444
- uses: conda-incubator/setup-miniconda@v2
525445
with:
526446
activate-environment: modin
@@ -601,11 +521,6 @@ jobs:
601521
- uses: actions/checkout@v2
602522
with:
603523
fetch-depth: 1
604-
- name: Cache pip
605-
uses: actions/cache@v1
606-
with:
607-
path: ~/.cache/pip
608-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
609524
- uses: conda-incubator/setup-miniconda@v2
610525
with:
611526
activate-environment: modin

‎.github/workflows/push.yml‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,13 @@
11
name: master
22
on: push
33
jobs:
4-
prepare-cache:
5-
runs-on: ${{ matrix.os }}
6-
strategy:
7-
matrix:
8-
os: ["ubuntu-latest", "windows-latest"]
9-
python-version: ["3.6", "3.7", "3.8"]
10-
steps:
11-
- uses: actions/checkout@v2
12-
with:
13-
fetch-depth: 1
14-
- name: Cache pip if Ubuntu
15-
if: startsWith(runner.os, 'Linux')
16-
uses: actions/cache@v1
17-
with:
18-
path: ~/.cache/pip
19-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
20-
- name: Cache pip if Windows
21-
if: startsWith(runner.os, 'Windows')
22-
uses: actions/cache@v1
23-
with:
24-
path: ~\AppData\Local\pip\Cache
25-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
26-
- uses: actions/setup-python@v2
27-
with:
28-
python-version: ${{matrix.python-version}}
29-
architecture: "x64"
30-
- run: pip install "ray>=1.0.0"
31-
324
test-internals:
33-
needs: prepare-cache
345
runs-on: ubuntu-latest
356
name: test-internals
367
steps:
378
- uses: actions/checkout@v2
389
with:
3910
fetch-depth: 1
40-
- name: Cache pip
41-
uses: actions/cache@v1
42-
with:
43-
path: ~/.cache/pip
44-
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
4511
- uses: conda-incubator/setup-miniconda@v2
4612
with:
4713
activate-environment: modin
@@ -65,7 +31,6 @@ jobs:
6531
run: python -m pytest modin/test/backends/pandas/test_internals.py
6632

6733
test-defaults:
68-
needs: prepare-cache
6934
runs-on: ubuntu-latest
7035
strategy:
7136
matrix:
@@ -78,11 +43,6 @@ jobs:
7843
- uses: actions/checkout@v2
7944
with:
8045
fetch-depth: 1
81-
- name: Cache pip
82-
uses: actions/cache@v1
83-
with:
84-
path: ~/.cache/pip
85-
key: ${{ runner.os }}-python-3.6-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
8646
- uses: conda-incubator/setup-miniconda@v2
8747
with:
8848
activate-environment: modin
@@ -131,7 +91,6 @@ jobs:
13191
run: bash <(curl -s https://codecov.io/bash)
13292

13393
test-omnisci:
134-
needs: prepare-cache
13594
runs-on: ubuntu-latest
13695
env:
13796
MODIN_MEMORY: 1000000000
@@ -143,11 +102,6 @@ jobs:
143102
- uses: actions/checkout@v2
144103
with:
145104
fetch-depth: 1
146-
- name: Cache pip
147-
uses: actions/cache@v1
148-
with:
149-
path: ~/.cache/pip
150-
key: ${{ runner.os }}-python-3.7-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
151105
- name: Setting up Modin environment
152106
uses: conda-incubator/setup-miniconda@v2
153107
with:
@@ -169,7 +123,6 @@ jobs:
169123
run: bash <(curl -s https://codecov.io/bash)
170124

171125
test-all:
172-
needs: prepare-cache
173126
runs-on: ubuntu-latest
174127
strategy:
175128
matrix:
@@ -183,11 +136,6 @@ jobs:
183136
- uses: actions/checkout@v2
184137
with:
185138
fetch-depth: 1
186-
- name: Cache pip
187-
uses: actions/cache@v1
188-
with:
189-
path: ~/.cache/pip
190-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
191139
- uses: conda-incubator/setup-miniconda@v2
192140
with:
193141
activate-environment: modin
@@ -240,7 +188,6 @@ jobs:
240188
run: bash <(curl -s https://codecov.io/bash)
241189

242190
test-windows:
243-
needs: prepare-cache
244191
runs-on: windows-latest
245192
strategy:
246193
matrix:
@@ -255,11 +202,6 @@ jobs:
255202
- uses: actions/checkout@v2
256203
with:
257204
fetch-depth: 1
258-
- name: Cache pip
259-
uses: actions/cache@v1
260-
with:
261-
path: ~\AppData\Local\pip\Cache
262-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
263205
- uses: conda-incubator/setup-miniconda@v2
264206
with:
265207
activate-environment: modin
@@ -327,7 +269,6 @@ jobs:
327269
run: codecov -f ./coverage.xml
328270

329271
test-pyarrow:
330-
needs: prepare-cache
331272
runs-on: ubuntu-latest
332273
strategy:
333274
matrix:
@@ -340,11 +281,6 @@ jobs:
340281
- uses: actions/checkout@v2
341282
with:
342283
fetch-depth: 1
343-
- name: Cache pip
344-
uses: actions/cache@v1
345-
with:
346-
path: ~/.cache/pip
347-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ github.run_id }}-${{ hashFiles('environment.yml') }}
348284
- uses: conda-incubator/setup-miniconda@v2
349285
with:
350286
activate-environment: modin

‎environment.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ dependencies:
3333
- cloudpickle==1.4.1
3434
- boto3
3535
- asv
36-
- pip:
37-
- ray>=1.0.0
36+
- ray-core >=1.0.0

‎requirements/env_omnisci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ dependencies:
1414
- pygithub==1.53
1515
- omniscidbe4py
1616
- s3fs>=0.4.2
17-
- pip:
18-
- ray>=1.0.0
17+
- ray-core >=1.0.0

0 commit comments

Comments
 (0)