From 531f0db15e8e5361d5a1bf65dff2b5dfe3bdc9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Voituret?= <fvoituret@deezer.com>
Date: Wed, 8 Jul 2020 16:00:20 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20add=20pip=20cache=20and=20clean?=
 =?UTF-8?q?=20workflows?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/pypi.yml   |  9 +++------
 .github/workflows/pytest.yml | 15 +++++++++------
 requirements.txt             |  9 ---------
 3 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 26a98c8..ad9996f 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -16,15 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Cache sdist packages
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-sdist-packages
+      - uses: actions/cache@v2
         with:
           path: dist
-          key: sdist-${{ matrix.platform }}-${{ hashFiles('setup.py') }}
+          key: sdist-${{ matrix.platform }}-${{ hashFiles('**/setup.py') }}
           restore-keys: |
-            sdist-${{ matrix.platform }}-${{ hashFiles('setup.py') }}
+            sdist-${{ matrix.platform }}-${{ hashFiles('**/setup.py') }}
             sdist-${{ matrix.platform }}
             sdist-
       - if: ${{ matrix.platform }} == 'cpu'
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 2b9019b..4fd7c19 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -14,15 +14,18 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Cache spleeter models
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-spleeter-model
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - uses: actions/cache@v2
         with:
           path: pretrained_models
-          key: models-${{ hashFiles('spleeter/model/__init__.py') }}
+          key: models-${{ hashFiles('**/setup.py') }}
           restore-keys: |
-            models-${{ hashFiles('spleeter/model/__init__.py') }}
+            models-${{ hashFiles('**/setup.py') }}
             models-
       - name: Install dependencies
         run: |
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 28f7286..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-importlib_resources; python_version<'3.7'
-requests
-setuptools>=41.0.0
-pandas==0.25.1
-tensorflow==1.15.2
-ffmpeg-python
-norbert==0.2.1
-librosa==0.7.2
-numba==0.48.0
\ No newline at end of file