Merge pull request #32 from bmcfee/transform_jam_requirement

Transform jam requirement
bmcfee · Feb 22, 2017 · ce7c3cc · ce7c3cc
2 parents cf9f38e + cf0d453
commit ce7c3cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ be easily consumed by statistical algorithms.  Some desired features:
 >>> sr, hop_length = 44100, 512
 
 >>> # Create a feature extraction object
->>> p_cqt = pumpp.feature.ConstantQ(name='cqt', sr=sr, hop_length=hop_length)
+>>> p_cqt = pumpp.feature.CQT(name='cqt', sr=sr, hop_length=hop_length)
 
 >>> # Create some annotation extractors
 >>> p_beat = pumpp.task.BeatTransformer(sr=sr, hop_length=hop_length)

diff --git a/pumpp/core.py b/pumpp/core.py
@@ -16,7 +16,7 @@
 from .feature import FeatureExtractor
 
 
-def transform(audio_f, *ops, **kwargs):
+def transform(audio_f, jam, *ops):
     '''Apply a set of operations to a track
 
     Parameters
@@ -41,8 +41,6 @@ def transform(audio_f, *ops, **kwargs):
     # Load the audio
     y, sr = librosa.load(audio_f, sr=None, mono=True)
 
-    jam = kwargs.pop('jam', None)
-
     if jam is None:
         jam = jams.JAMS()
         jam.file_metadata.duration = librosa.get_duration(y=y, sr=sr)

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -43,7 +43,7 @@ def test_transform(audio_f, jam, sr, hop_length):
                                              namespace='tag_open',
                                              labels=['rock', 'jazz'])]
 
-    data = pumpp.transform(audio_f, jam=jam, *ops)
+    data = pumpp.transform(audio_f, jam, *ops)
 
     # Fields we should have:
     assert set(data.keys()) == set(['stft/mag', 'stft/phase',