Release 1.2.1 with correct dependency management in setup.py.

CHANGES.md

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+1.2.1
+-----
+Fixed dependency problem during setup.py that prevented the package from being 
+installed if the dependent libraries are not yet installed (which defeats
+the purpose of declaring dependencies in setup.py).
+Changing to semantic versioning with three numbers. 
+1.2 is now considered 1.2.0.
+
+1.2
+---
+Attempting to declare dependencies in setup.py properly
+
 1.1
 ---
 Updated MuscimaPlusPlusSymbolImageGenerator to work with MUSCIMA++ 2.0.

omrdatasettools/__init__.py

@@ -1,12 +1,12 @@
 from __version__ import __version__ as version
-from .Downloader import *
-from .OmrDataset import OmrDataset
 from .AudiverisOmrImageGenerator import AudiverisOmrImageGenerator
 from .CapitanImageGenerator import CapitanImageGenerator
+from .Downloader import *
 from .HomusImageGenerator import HomusImageGenerator
 from .MeasureVisualizer import MeasureVisualizer
-from .MuscimaPlusPlusSymbolImageGenerator import MuscimaPlusPlusSymbolImageGenerator
 from .MuscimaPlusPlusMaskImageGenerator import MuscimaPlusPlusMaskImageGenerator
+from .MuscimaPlusPlusSymbolImageGenerator import MuscimaPlusPlusSymbolImageGenerator
+from .OmrDataset import OmrDataset
 
 __version__ = version
 __all__ = ['Downloader', 'OmrDataset', 'AudiverisOmrImageGenerator', 'CapitanImageGenerator', 'HomusImageGenerator',

setup.py

@@ -35,7 +35,8 @@ def get_long_description():
         logging.warning('Could not find README.md and CHANGES.md file'
                         ' in directory {0}. Contents:'
                         ' {1}'.format(here, os.listdir(here)))
-        long_description = 'A collection of tools that simplify the downloading and handling of datasets used for Optical Music Recognition (OMR).' \
+        long_description = 'A collection of tools that simplify the downloading and handling of datasets used for ' \
+                           'Optical Music Recognition (OMR).' \
                            'These tools are available as Python package ``omrdatasettools`` on PyPi.' \
                            '' \
                            'They simplify the most common tasks such as downloading and extracting a dataset, ' \
@@ -47,7 +48,8 @@ def get_long_description():
     name='omrdatasettools',
     packages=find_packages('.'),
     version=version_number,
-    description='A collection of tools that simplify the downloading and handling of datasets used for Optical Music Recognition (OMR).',
+    description='A collection of tools that simplify the downloading and handling of datasets used for Optical Music '
+                'Recognition (OMR).',
     long_description=get_long_description(),
     long_description_content_type="text/markdown",
     author='Alexander Pacha',