Skip to content

Commit

Permalink
GIT: Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
laborleben committed Jan 4, 2018
2 parents 6860243 + c55c949 commit de4395c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion SiLibUSB/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from siusbdevice import SiUSBDevice, GetUSBBoards, GetUSBDevices, __version__, __version_info__
from .siusbdevice import SiUSBDevice, GetUSBBoards, GetUSBDevices, __version__, __version_info__
__all__ = ['SiUSBDevice', 'GetUSBBoards', 'GetUSBDevices', '__version__', '__version_info__']
4 changes: 3 additions & 1 deletion SiLibUSB/siusbdevice.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
when several USB devices are connected
2.0.7:
- bump version for pypi, no changes
2.0.8:
- fixing imports in __init__.py
"""

import usb.core
Expand All @@ -83,7 +85,7 @@
from itertools import chain, islice
# import sys

__version__ = '2.0.7'
__version__ = '2.0.8'
__version_info__ = (tuple([int(num) for num in __version__.split('.')]), 'final', 0)

# set debugging options for pyUSB
Expand Down

0 comments on commit de4395c

Please sign in to comment.