Index: dialin/__init__.py =================================================================== diff -u -r82e32ae00355b2245a2660569935de152a883799 -r8e32afb5793619bd651b8964609a8e9aee3a5e4c --- dialin/__init__.py (.../__init__.py) (revision 82e32ae00355b2245a2660569935de152a883799) +++ dialin/__init__.py (.../__init__.py) (revision 8e32afb5793619bd651b8964609a8e9aee3a5e4c) @@ -1,7 +1,7 @@ -from .version import VERSION +from .version import DEV_VERSION from .hd import * from .dg import * from .ui import * from .utils import * -__version__ = VERSION \ No newline at end of file +__version__ = DEV_VERSION \ No newline at end of file Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r2a9294e72f995e2800d7303f6cc2a67d1839654b -r8e32afb5793619bd651b8964609a8e9aee3a5e4c --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 2a9294e72f995e2800d7303f6cc2a67d1839654b) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 8e32afb5793619bd651b8964609a8e9aee3a5e4c) @@ -39,7 +39,7 @@ from .service_record import DGServiceNVRecord from .scheduled_runs_record import DGScheduledRunsNVRecord from .valves import DGValves -from .voltages import import DGVoltages +from .voltages import DGVoltages from ..utils.conversions import integer_to_bytearray from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish, _LogManager Index: setup.py =================================================================== diff -u -ra3e1c7cc35fc1f2d0b3240341f161efb3e407549 -r8e32afb5793619bd651b8964609a8e9aee3a5e4c --- setup.py (.../setup.py) (revision a3e1c7cc35fc1f2d0b3240341f161efb3e407549) +++ setup.py (.../setup.py) (revision 8e32afb5793619bd651b8964609a8e9aee3a5e4c) @@ -14,11 +14,11 @@ # ############################################################################ import setuptools -from version import VERSION +from version import * setuptools.setup( name="dialin", - version=VERSION, + version=DEV_VERSION, author="Peter Lucia", author_email="plucia@diality.com", description="The Diality Dialin API",