separate data folder (usage part)

mdeff · Jun 17, 2020 · 68d7d0d · 68d7d0d
1 parent 5b3ac9e
commit 68d7d0d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,10 +5,6 @@ __pycache__/
 # IPython checkpoints
 .ipynb_checkpoints/
 
+# Environment
 .env
 .python-version
-
-# Data
-*.csv
-*.pickle
-*.mp3
diff --git a/analysis.ipynb b/analysis.ipynb
@@ -42,10 +42,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tracks = utils.load('tracks.csv')\n",
-    "genres = utils.load('genres.csv')\n",
-    "features = utils.load('features.csv')\n",
-    "echonest = utils.load('echonest.csv')\n",
+    "tracks = utils.load('data/fma_metadata/tracks.csv')\n",
+    "genres = utils.load('data/fma_metadata/genres.csv')\n",
+    "features = utils.load('data/fma_metadata/features.csv')\n",
+    "echonest = utils.load('data/fma_metadata/echonest.csv')\n",
     "\n",
     "np.testing.assert_array_equal(features.index, tracks.index)\n",
     "assert echonest.index.isin(tracks.index).all()\n",

diff --git a/baselines.ipynb b/baselines.ipynb
@@ -55,9 +55,9 @@
    "source": [
     "AUDIO_DIR = os.environ.get('AUDIO_DIR')\n",
     "\n",
-    "tracks = utils.load('tracks.csv')\n",
-    "features = utils.load('features.csv')\n",
-    "echonest = utils.load('echonest.csv')\n",
+    "tracks = utils.load('data/fma_metadata/tracks.csv')\n",
+    "features = utils.load('data/fma_metadata/features.csv')\n",
+    "echonest = utils.load('data/fma_metadata/echonest.csv')\n",
     "\n",
     "np.testing.assert_array_equal(features.index, tracks.index)\n",
     "assert echonest.index.isin(tracks.index).all()\n",

diff --git a/data/.gitignore b/data/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/usage.ipynb b/usage.ipynb
@@ -53,10 +53,10 @@
     "AUDIO_DIR = os.environ.get('AUDIO_DIR')\n",
     "\n",
     "# Load metadata and features.\n",
-    "tracks = utils.load('tracks.csv')\n",
-    "genres = utils.load('genres.csv')\n",
-    "features = utils.load('features.csv')\n",
-    "echonest = utils.load('echonest.csv')\n",
+    "tracks = utils.load('data/fma_metadata/tracks.csv')\n",
+    "genres = utils.load('data/fma_metadata/genres.csv')\n",
+    "features = utils.load('data/fma_metadata/features.csv')\n",
+    "echonest = utils.load('data/fma_metadata/echonest.csv')\n",
     "\n",
     "np.testing.assert_array_equal(features.index, tracks.index)\n",
     "assert echonest.index.isin(tracks.index).all()\n",