Merge b63be36 into b1ab223

.gitattributes

@@ -0,0 +1,2 @@
+*.tar.gz filter=lfs diff=lfs merge=lfs -text
+lfs/*.tar.gz filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -19,7 +19,6 @@
 # git has its own built in compression methods
 *.7z
 *.dmg
-*.gz
 *.iso
 *.jar
 *.rar

.travis.yml

@@ -9,8 +9,8 @@ cache:
 
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
+  - "3.6"
 
 addons:
   apt:

.travis_dependencies.sh

@@ -34,11 +34,9 @@ if [ ! -d "$src" ]; then
 
         source activate $ENV_NAME
 
-        pip install python-coveralls
+        conda install -c conda-forge ffmpeg
 
-        if [ "$ENABLE_NUMBA" = true ]; then
-            conda install numba
-        fi
+        pip install python-coveralls
 
         source deactivate
     popd

.travis_download_mdb.sh

@@ -2,7 +2,8 @@
 
 if [ ! -d "$HOME/data/MedleyDB_sample" ]; then
     mkdir -p $HOME/data
-    wget http://marl.smusic.nyu.edu/medleydb_webfiles/MedleyDB_sample.tar.gz -O $HOME/data/MedleyDB_sample.tar.gz
+    wget https://zenodo.org/record/1438309/files/MedleyDB_Sample.tar.gz?download=1 -O $HOME/data/MedleyDB_sample.tar.gz
+    ls $HOME/data/*
     gzip -d $HOME/data/MedleyDB_sample.tar.gz
     tar xvf $HOME/data/MedleyDB_sample.tar -C $HOME/data/
-fi
+fi

medleydb/data/Metadata/ChristinaAguilera_GenieInABottle_METADATA.yaml

@@ -35,15 +35,15 @@ stems:
         filename: ChristinaAguilera_GenieInABottle_RAW_01_06.wav
         instrument: shaker
   S02:
-    component: bass
+    component: ''
     filename: ChristinaAguilera_GenieInABottle_STEM_02.wav
     instrument: distorted electric guitar
     raw:
       R01:
         filename: ChristinaAguilera_GenieInABottle_RAW_02_01.wav
         instrument: distorted electric guitar
   S03:
-    component: ''
+    component: 'bass'
     filename: ChristinaAguilera_GenieInABottle_STEM_03.wav
     instrument: electric bass
     raw:

medleydb/download.py

@@ -227,7 +227,7 @@ def download_stem(mtrack, stemid):
     except KeyError:
         raise IOError("Unable to find data in Google Drive for this version.")
 
-    file_list = get_named_child(top_folderid, mtrack.title)
+    file_list = get_named_child(top_folderid, mtrack.track_id)
     correct_file = [f for f in file_list if f['title'] == mtrack.track_id]
 
     if len(correct_file) == 0:
@@ -285,7 +285,7 @@ def download_raw(mtrack, stemid, rawid):
     except KeyError:
         raise IOError("Unable to find data in Google Drive for this version.")
 
-    file_list = get_named_child(top_folderid, mtrack.title)
+    file_list = get_named_child(top_folderid, mtrack.track_id)
     correct_file = [f for f in file_list if f['title'] == mtrack.track_id]
 
     if len(correct_file) == 0:
@@ -332,8 +332,8 @@ def get_named_child(parent_id, child_name):
 
     """
     authorize_google_drive()
-    query = "'{}' in parents and title contains '{}' and trashed=false".format(
-        parent_id, child_name
+    query = "title contains '{}' and trashed=false".format(
+        child_name
     )
     file_list = DRIVE.ListFile(
         {'q': query}

medleydb/version.py

@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 """Version info"""
 
-version = "1.3.3"
+version = "1.3.4"

setup.py

@@ -53,7 +53,7 @@
             'pyyaml >= 3.11',
             'numpy >= 1.8.0',
             'six >= 1.3',
-            'librosa >= 0.5.0',
+            'librosa >= 0.6.2',
             'pydrive >= 1.3.1',
             'scipy >= 0.13.0',
             'scikit-learn >= 0.18'