hiro/jobmanager
1
0
Fork 0
mirror of https://github.com/vale981/jobmanager synced 2025-03-05 09:51:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
Richard Hartmann 2016-09-30 23:50:05 +02:00
commit 4bccdb3fa4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

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

2
jobmanager/jobmanager.py
View file

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

2
tests/test_jobmanager.py
View file

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