From b672fff56493f86c5fa5d98d568c33aba3ade63d Mon Sep 17 00:00:00 2001
From: "J. Borovec" <jirka.borovec@seznam.cz>
Date: Sun, 26 Apr 2020 23:35:08 +0200
Subject: [PATCH] revert

---
 .github/workflows/ci-testing.yml | 40 +++++++++++---------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml
index d5584198..5b91ebe4 100644
--- a/.github/workflows/ci-testing.yml
+++ b/.github/workflows/ci-testing.yml
@@ -1,6 +1,6 @@
 name: CI testing
 
-# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
+# https://help.github.com/en/actions/reference/events-that-trigger-workflows
 on:
   # Trigger the workflow on push or pull request,
   # but only for the master branch
@@ -42,38 +42,35 @@ jobs:
       run: |
         brew install libomp  # https://github.com/pytorch/pytorch/issues/20030
         brew install openmpi  # Horovod on macOS requires OpenMPI, Gloo not currently supported
-
     - name: Setup Windows
       if: runner.os == 'windows'
       run: |
         python -c "lines = [line for line in open('requirements-extra.txt').readlines() if not line.startswith('horovod')] ; open('requirements-extra.txt', 'w').writelines(lines)"
-
     # TODO: remove after https://github.com/pytorch/pytorch/issues/32186 is resolved
     - name: Setup Windows on Latest
       if: runner.os == 'windows' && matrix.requires == 'latest'
       run: |
         python -c "req = open('requirements.txt').read().replace('torch>=1.1', 'torch<1.5') ; open('requirements.txt', 'w').write(req)"
-
     - name: Set min. dependencies
       if: matrix.requires == 'minimal'
       run: |
         python -c "req = open('requirements.txt').read().replace('>', '=') ; open('requirements.txt', 'w').write(req)"
         python -c "req = open('requirements-extra.txt').read().replace('>', '=') ; open('requirements-extra.txt', 'w').write(req)"
-
-    # Note: This uses an internal pip API and may not always work
-    # https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
-    - name: Get pip cache
-        id: pip-cache
-        run: |
-          python -c "from pip._internal.locations import USER_CACHE_DIR; print('::set-output name=dir::' + USER_CACHE_DIR)"
-
     - name: Cache pip
-    - uses: actions/cache@v1
+      uses: actions/cache@v1
       with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements-extra.txt') }}
+        path: ~/.cache/pip # This path is specific to Ubuntu
+        # Look to see if there is a cache hit for the corresponding requirements file
+        key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}
         restore-keys: |
-          ${{ runner.os }}-${{ matrix.python-version }}-pip-
+          ${{ runner.os }}-pip-${{ matrix.python-version }}-
+          ${{ runner.os }}-${{ matrix.python-version }}-
+    - name: Cache datasets
+      uses: actions/cache@v1
+      with:
+        path: tests/Datasets # This path is specific to Ubuntu
+        # Look to see if there is a cache hit for the corresponding requirements file
+        key: mnist-dataset
 
     - name: Install dependencies
       run: |
@@ -86,13 +83,6 @@ jobs:
         pip list
       shell: bash
 
-    - name: Cache datasets
-      uses: actions/cache@v1
-      with:
-        path: tests/Datasets # This path is specific to Ubuntu
-        # Look to see if there is a cache hit for the corresponding requirements file
-        key: mnist-dataset
-
     - name: Tests
       # env:
       #   TOXENV: py${{ matrix.python-version }}
@@ -101,7 +91,6 @@ jobs:
         # flake8 .
         coverage run --source pytorch_lightning -m py.test pytorch_lightning tests -v --doctest-modules --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}.xml
         coverage report
-
     - name: Upload pytest test results
       uses: actions/upload-artifact@master
       with:
@@ -116,7 +105,6 @@ jobs:
         python setup.py check --metadata --strict
         python setup.py sdist
         twine check dist/*
-
     #- name: Try install package
     #  if: ! startsWith(matrix.os, 'windows')
     #  run: |
@@ -127,4 +115,4 @@ jobs:
     - name: Statistics
       if: success()
       run: |
-         coverage report
+         coverage report
\ No newline at end of file