Merge branch 'dev'

.travis.yml

@@ -26,8 +26,8 @@ before_install:
 - pip install sqlitedict
 - pip install h5py
 - pip install pytest pytest-cov
-- git clone https://github.com/cimatosa/progress.git progress_package
-- ln -s progress_package/progress
+- git clone https://github.com/cimatosa/progression.git progress_package
+- ln -s progress_package/progression
 - git clone https://github.com/cimatosa/binfootprint.git binfootprint_package
 - ln -s binfootprint_package/binfootprint
 - git clone https://github.com/cimatosa/persistentdata.git persistentdata_package

jobmanager/jobmanager.py

@@ -44,7 +44,7 @@ import time
 import traceback
 import warnings
 import binfootprint as bf
-import progress
+import progression as progress
 import logging
 import threading
 import ctypes

tests/test_jobmanager.py

@@ -19,7 +19,7 @@ sys.path = [split(dirname(abspath(__file__)))[0]] + sys.path
 
 import jobmanager
 import binfootprint
-import progress
+import progression as progress
 
 if sys.version_info[0] == 2:
     TIMEOUT = 300