Preparation for Upload to Pip. Small improvements on test script.

Author: karlTGA

.gitignore

@@ -61,3 +61,4 @@ target/
 
 # Local databases
 *.db
+/protokoll Kommunikation

maxcul/test/test_maxcul.py

@@ -123,6 +123,22 @@ def test_time_information(self):
         self.assertEqual(msg.payload, "0E0102E117")
         self.assertEqual(msg.decoded_payload, datetime(2014, 12, 1, 2, 33, 23))
 
+    def test_wallthermostat_control_message(self):
+        sample = "Z0CB9044217A95512DC400019D9"
+        msg = MoritzMessage.decode_message(sample)
+        self.assertTrue(isinstance(msg, WallThermostatControlMessage))
+        self.assertEqual(msg.counter, 0xB9)
+        self.assertEqual(msg.flag, 0x04)
+        self.assertEqual(msg.sender_id, 0x17A955)
+        self.assertEqual(msg.receiver_id, 0x12DC40)
+        self.assertEqual(msg.group_id, 0)
+        self.assertEqual(msg.payload, "19D9")
+        self.assertEqual(msg.decoded_payload, {
+            "desired_temprature": 12,
+            "temprature": 21
+        })
+        #wallthermostat updated <WallThermostatStateMessage counter:c0 flag:4 sender:17a955 receiver:0 group:0 payload:59011900D9>
+
 
 class MessageGeneralOutputTestCase(unittest.TestCase):
     def test_encoding_without_payload(self):

requirements.txt

@@ -1,3 +1,4 @@
+pytest
 blinker
 detach
 flask

setup.py

@@ -1,15 +1,15 @@
-from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
+from setuptools import setup
+from setuptools.command.test import test as testcommand
 
 import io
-import codecs
 import os
 import sys
 
 import maxcul
 
 here = os.path.abspath(os.path.dirname(__file__))
 
+
 def read(*filenames, **kwargs):
     encoding = kwargs.get('encoding', 'utf-8')
     sep = kwargs.get('sep', '\n')
@@ -19,11 +19,13 @@ def read(*filenames, **kwargs):
             buf.append(f.read())
     return sep.join(buf)
 
+
 long_description = read('README', 'CHANGELOG')
 
-class PyTest(TestCommand):
+
+class PyTest(testcommand):
     def finalize_options(self):
-        TestCommand.finalize_options(self)
+        testcommand.finalize_options(self)
         self.test_args = []
         self.test_suite = True
 
@@ -32,19 +34,21 @@ def run_tests(self):
         errcode = pytest.main(self.test_args)
         sys.exit(errcode)
 
+
 setup(
     name='maxcul',
     version=maxcul.__version__,
     url='https://github.com/karlTGA/MaxCul-Python',
     license='BSD License',
-    author='Karl Wolffgang',
+    author='Markus Ullmann, Karl Wolffgang',
     tests_require=['pytest'],
     install_requires=['Flask>=0.12',
-                    'Flask-SQLAlchemy>=2.1',
-                    'blinker>=1.4',
-                    'detach>=1.0',
-                    'pyserial>=3.1.1'
-                    ],
+                      'Flask-SQLAlchemy>=2.1',
+                      'blinker>=1.4',
+                      'detach>=1.0',
+                      'pyserial>=3.1.1',
+                      'pytest>=3.0.5'
+                      ],
     cmdclass={'test': PyTest},
     author_email='[email protected]',
     description='Access with Python MAX! Devices over a CUL Stick',
@@ -53,7 +57,7 @@ def run_tests(self):
     include_package_data=True,
     platforms='any',
     test_suite='maxcul.test.test_maxcul',
-    classifiers = [
+    classifiers=[
         'Programming Language :: Python',
         'Development Status :: 4 - Beta',
         'Natural Language :: English',
@@ -63,8 +67,8 @@ def run_tests(self):
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Home Automation'
-        ],
+    ],
     extras_require={
         'testing': ['pytest'],
     }
-)
+)