Merge pull request #8 from sertansenturk/v1.2.2

V1.2.2

Changelog.md

@@ -1,8 +1,12 @@
+#### predominantmelodymakam v1.2.2
+ - Corrected the name of the 'pitchfilter' package in the requirements file.
+ - Fixed a bug where the while loop fails directly when the audio input is very short.
+
 #### predominantmelodymakam v1.2.1
  - Fixed a bug where the extract() method was not returning anything
 
 #### predominantmelodymakam v1.2
- - Added the [pitchfilter](https://github.com/hsercanatli/pitchfilter) repository as a fallback if the Essetian PitchFilter does not work due to Essentia version problem (e.g. the official version for Ubuntu 14.04).
+ - Added the [pitchfilter](https://github.com/hsercanatli/pitchfilter) repository as a fallback if the Essentia PitchFilter does not work due to Essentia version problem (e.g. the official version for Ubuntu 14.04).
  - Added flake8 checking to Travis CI
 
 #### predominantmelodymakam v1.1

predominantmelodymakam/predominantmelodymakam.py

@@ -215,7 +215,8 @@ def select_contours(self, pitch_contours, contour_saliences, start_times,
         try:
             # the pitch contours is a list of numpy arrays, parse them starting
             # with the longest contour
-            while pitch_contours:  # terminate when all the contours are checked
+            while pitch_contours:  # terminate when all the contours are
+                # checked
                 # print len(pitchContours)
 
                 # get the lengths of the pitchContours
@@ -243,10 +244,10 @@ def select_contours(self, pitch_contours, contour_saliences, start_times,
                                           contour_saliences, lens, acc_idx)
         except ValueError:
             # if the audio input is very short such that Essentia returns a
-            # returns a single contour as a numpy array (of length 1) of numpy
-            # array (of length 1). In this case the while loop fails directly
+            # single contour as a numpy array (of length 1) of numpy array
+            # (of length 1). In this case the while loop fails directly
             # as it tries to check all the truth value of an all pitch values,
-            # instead of checking whether the list is emptry or not.
+            # instead of checking whether the list is empty or not.
             # Here we handle the error in a Pythonic way by simply breaking the
             # loop and assigning the inputs to outputs since a single contour
             # means nothing to filter

setup.py

@@ -4,7 +4,7 @@
 
 setup(name='predominantmelodymakam',
     description='Predominant melody extraction of makam music',
-    version='1.2.1',
+    version='1.2.2',
     author='Sertan Senturk',
     author_email='contact AT sertansenturk DOT com',
     license='agpl 3.0',