Skip to content

Commit

Permalink
Merge pull request #81 from ChristianTremblay/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ChristianTremblay committed Apr 11, 2018
2 parents ac08eb5 + af7e64b commit 2a6a991
Show file tree
Hide file tree
Showing 140 changed files with 25,096 additions and 2,063 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ python:
- '3.4'
- '3.5'
- '3.6'
- 3.6-dev
bundler_args: "--retry 3"
install:
- pip install -r requirements.txt
- pip install coveralls
- pip install pytest
- pip install pytest-cov
- pip install pandas
- pip install bokeh
- pip install flask

script:
- coverage run --source BAC0 -m pytest -v
- coverage report
Expand Down
27 changes: 21 additions & 6 deletions BAC0/__init__.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

try:
from . import core
from . import tasks
from .scripts.BasicScript import BasicScript
from .scripts.ReadWriteScript import ReadWriteScript as connect
from .scripts.Base import Base
from .core.devices.Device import Device as device
from .core.devices.Device import DeviceLoad as load
from .tasks.Poll import SimplePoll as poll
from .tasks.Match import Match as match
from .bokeh.BokehRenderer import BokehPlot as chart
from .core.utils.notes import update_log_level as log_level
from .infos import __version__ as version
except ImportError as error:
print(error)
# Not installed yet

# To be able to use the complete version pandas, flask and bokeh must be installed.
try:
import pandas
import bokeh
import flask
_COMPLETE = True
except ImportError:
_COMPLETE = False

if _COMPLETE:
from .scripts.Complete import Complete as connect
from .scripts.Lite import Lite as lite
else:
from .scripts.Lite import Lite as connect

except ImportError:
pass # Probably installing the app...
61 changes: 0 additions & 61 deletions BAC0/bokeh/BokehLoopUntilClosed.py

This file was deleted.

Loading

0 comments on commit 2a6a991

Please sign in to comment.