MAINTENANCE: fixed music21 dependency

VERSION_HISTORY.md

@@ -9,6 +9,8 @@ the top of the file.
     - Importing no longer uses/stores cached pickle files.
     - WorkflowManager.output() produces many table-format results if "count frequency" is False.
     - WorkflowManager.output() changes the column name for table-like outputs, according to the experiment.
+* 2.1.1
+    - fixed music21 dependency
 * 2.1.0
     - NoteBeatStrengthIndexer and accompanying tests
     - DurationIndexer and accompanying tests

setup.py

@@ -52,13 +52,18 @@
     requires = [
         # NB: keep this in sync with vis/requirements.txt and vis/optional_requirements.txt
         # NB2: I left out the optional requirements and mock, since they aren't *required*
-        'music21 (>= 2.0.3, <2.1)',
+        'music21 (>=2.0.3, <2.1)',
         'pandas (>=0.14.1, <0.16)',
         ],
     install_requires = [
-        'music21 >=2.0.3, <2.1',
+        'music21 >= 2.0.3, <2.1',
         'pandas >=0.14.1, <0.16',
         ],
+    dependency_links = [
+        # music21 2.0.3 has not been released to PyPl yet (2015-05-20).
+        # This particular commit fixes an issue with exporting fermatas on rests.
+        "https://github.com/cuthbertLab/music21/archive/3fb33def708602485eadc1a655ede2fe22acb766.zip#egg=music21-2.0.3"
+    ],
     packages = [
         'vis',
         'vis.models',

vis/__init__.py

@@ -1,4 +1,4 @@
 _MAJOR = 2
 _MINOR = 1
-_PATCH = 0
+_PATCH = 1
 __version__ = '{}.{}.{}'.format(_MAJOR, _MINOR, _PATCH)

vis/requirements.txt

@@ -1,9 +1,9 @@
 # These packages are required for vis.
 # Certain functionality will be missing; see optional_requirements.txt.
 # music21>=2.0.3,<2.1
--e git://github.com/cuthbertLab/music21.git@b1c2b36af19dd7218672b568a29290365ff1af97 # Use this until released
+-e git://github.com/cuthbertLab/music21.git@3fb33def708602485eadc1a655ede2fe22acb766 # Use this until released
 pandas>=0.14.1,<0.16
 mock>=1.0.1
 coverage
 python-coveralls
-six
+six