From c5aac3ef99d14305ea9a130e14155fc37495e199 Mon Sep 17 00:00:00 2001
From: Vasily Litvinov <45396231+vnlitvinov@users.noreply.github.com>
Date: Fri, 18 Dec 2020 18:09:19 +0300
Subject: [PATCH] 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>
---
 .github/workflows/ci.yml     | 85 ------------------------------------
 .github/workflows/push.yml   | 64 ---------------------------
 environment.yml              |  3 +-
 requirements/env_omnisci.yml |  3 +-
 4 files changed, 2 insertions(+), 153 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7d707ea29b9..6a60dc518f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 8e8144e2d31..ed5f506bd75 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -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
@@ -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:
@@ -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
@@ -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
@@ -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:
@@ -169,7 +123,6 @@ jobs:
         run: bash <(curl -s https://codecov.io/bash)
 
   test-all:
-    needs: prepare-cache
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -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
@@ -240,7 +188,6 @@ jobs:
         run: bash <(curl -s https://codecov.io/bash)
 
   test-windows:
-    needs: prepare-cache
     runs-on: windows-latest
     strategy:
       matrix:
@@ -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
@@ -327,7 +269,6 @@ jobs:
         run: codecov -f ./coverage.xml
 
   test-pyarrow:
-    needs: prepare-cache
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -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
diff --git a/environment.yml b/environment.yml
index aa4335139bf..b7cdf1814f7 100644
--- a/environment.yml
+++ b/environment.yml
@@ -33,5 +33,4 @@ dependencies:
   - cloudpickle==1.4.1
   - boto3
   - asv
-  - pip:
-    - ray>=1.0.0
+  - ray-core >=1.0.0
diff --git a/requirements/env_omnisci.yml b/requirements/env_omnisci.yml
index 6338aa92eb1..5ce98731ab4 100644
--- a/requirements/env_omnisci.yml
+++ b/requirements/env_omnisci.yml
@@ -14,5 +14,4 @@ dependencies:
   - pygithub==1.53
   - omniscidbe4py
   - s3fs>=0.4.2
-  - pip:
-    - ray>=1.0.0
+  - ray-core >=1.0.0