Merge branch 'dev' of https://github.com/riptideio/pymodbus into async

Author: dhoomakethu

.gitignore

@@ -22,7 +22,6 @@ pymodbus/server/__pycache__/
 test/__pycache__/
 **/pymodbus.db
 /.eggs/
-<<<<<<< HEAD
 /test/bin/
 /test/include/
 /test/lib/
@@ -37,3 +36,4 @@ test/__pycache__/
 /doc/html/
 /doc/_build/
 
+doc/source/example/asynchronous_client.rst

doc/source/example/performance.rst

@@ -1,7 +1,5 @@
+==================
 performance module
 ==================
+.. literalinclude:: ../../../examples/common/performance.py
 
-.. automodule:: performance
-    :members:
-    :undoc-members:
-    :show-inheritance:

doc/source/library/modules.rst

@@ -1,4 +1,4 @@
-pymodbus
+Pymodbus
 ========
 
 .. toctree::

doc/source/library/pymodbus.rst

@@ -1,4 +1,4 @@
-pymodbus package
+Pymodbus package
 ================
 
 .. automodule:: pymodbus

examples/common/asynchronous_processor.py

@@ -38,7 +38,7 @@
 STATUS_REGS = (1, 2)
 STATUS_COILS = (1, 3)
 CLIENT_DELAY = 1
-
+UNIT = 0x01
 
 # --------------------------------------------------------------------------- #
 # an example custom protocol
@@ -63,7 +63,7 @@ def fetch_holding_registers(self):
         """ Defer fetching holding registers
         """
         log.debug("Starting the next cycle")
-        d = self.read_holding_registers(*STATUS_REGS, unit=1)
+        d = self.read_holding_registers(*STATUS_REGS, unit=UNIT)
         d.addCallbacks(self.send_holding_registers, self.error_handler)
 
     def send_holding_registers(self, response):
@@ -73,7 +73,7 @@ def send_holding_registers(self, response):
         """
         self.endpoint.write(response.getRegister(0))
         self.endpoint.write(response.getRegister(1))
-        d = self.read_coils(*STATUS_COILS, unit=1)
+        d = self.read_coils(*STATUS_COILS, unit=UNIT)
         d.addCallbacks(self.start_next_cycle, self.error_handler)
 
     def start_next_cycle(self, response):

requirements.txt

@@ -2,7 +2,7 @@ six
 # -------------------------------------------------------------------
 # if want to use the pymodbus serial stack, uncomment these
 # -------------------------------------------------------------------
-# pyserial>=3.4
+pyserial>=3.4
 # -------------------------------------------------------------------
 # if you want to run the tests and code coverage, uncomment these
 # -------------------------------------------------------------------

setup.py

@@ -31,9 +31,9 @@
         line for line in reqs.read().split('\n')
         if (line and not line.startswith('--'))
     ]
-# --------------------------------------------------------------------------- #
+#---------------------------------------------------------------------------#
 # configuration
-# --------------------------------------------------------------------------- #
+#---------------------------------------------------------------------------#
 setup(
     name="pymodbus",
     version=__version__,
@@ -70,13 +70,11 @@
     platforms=['Linux', 'Mac OS X', 'Win'],
     include_package_data=True,
     zip_safe=True,
-    install_requires=[
-        'pyserial >= 2.6'
-    ],
+    install_requires=install_requires,
     extras_require={
         'quality': [
             'coverage >= 3.5.3',
-            'nose >= 1.2.1',
+            'pytest==3.3.1',
             'mock >= 1.0.0',
             'pep8 >= 1.3.3'
         ],
@@ -89,8 +87,7 @@
             'pycrypto >= 2.6'
         ],
     },
-    test_suite='nose.collector',
+    setup_requires=['pytest-runner'],
+    tests_require=['pytest'],
     cmdclass=command_classes,
 )
-
-