Merge pull request #154 from python-escpos/development

release v2.1.1

.gitignore

@@ -18,6 +18,7 @@ build/
 dist/
 .coverage
 src/escpos/version.py
+.hypothesis
 
 # testing temporary directories
 test/test-cli-output/

.travis.yml

@@ -28,6 +28,7 @@ matrix:
   allow_failures:
     - python: 3.5-dev
     - python: nightly
+    - python: pypy3
 before_install:
     - pip install tox codecov
 script:

CHANGELOG.rst

@@ -2,6 +2,19 @@
 Changelog
 *********
 
+2016-??-?? - Version 2.1.? - "Contents May Differ"
+--------------------------------------------------
+
+changes
+^^^^^^^
+- rename variable interface in USB-class to timeout
+- add support for hypothesis and move pypy3 to the allowed failures (pypy3 is not supported by hypothesis)
+
+contributors
+^^^^^^^^^^^^
+- Patrick Kanzler
+- Renato Lorenzi
+
 2016-07-23 - Version 2.1.0 - "But Who's Counting?"
 --------------------------------------------------
 

codecov.yml

@@ -1,4 +1,16 @@
+codecov:
+  bot: patkan
+
 coverage:
+  status:
+    project:
+      default:  # status context
+        target: auto
+        threshold: "1%"
+    patch:
+      default:
+        target: auto
+        threshold: "1%"
   range: "60...100"
 
 comment: off

setup.py

@@ -116,7 +116,7 @@ setup(
     setup_requires=[
         'setuptools_scm',
     ],
-    tests_require=['tox', 'nose', 'scripttest'],
+    tests_require=['tox', 'nose', 'scripttest', 'mock', 'hypothesis'],
     cmdclass={'test': Tox},
     entry_points={
         'console_scripts': [

src/escpos/printer.py

@@ -34,18 +34,18 @@ class Usb(Escpos):
 
     """
 
-    def __init__(self, idVendor, idProduct, interface=0, in_ep=0x82, out_ep=0x01, *args, **kwargs):
+    def __init__(self, idVendor, idProduct, timeout=0, in_ep=0x82, out_ep=0x01, *args, **kwargs):
         """
         :param idVendor: Vendor ID
         :param idProduct: Product ID
-        :param interface: USB device interface
+        :param timeout: Is the time limit of the USB operation. Default without timeout.
         :param in_ep: Input end point
         :param out_ep: Output end point
         """
         Escpos.__init__(self, *args, **kwargs)
         self.idVendor = idVendor
         self.idProduct = idProduct
-        self.interface = interface
+        self.timeout = timeout
         self.in_ep = in_ep
         self.out_ep = out_ep
         self.open()
@@ -82,7 +82,7 @@ class Usb(Escpos):
         :param msg: arbitrary code to be printed
         :type msg: bytes
         """
-        self.device.write(self.out_ep, msg, self.interface)
+        self.device.write(self.out_ep, msg, self.timeout)
 
     def close(self):
         """ Release USB interface """

tox.ini

@@ -5,6 +5,8 @@ envlist = py27, py34, py35, docs
 deps = nose
        coverage
        scripttest
+       mock
+       hypothesis
 commands = nosetests --with-coverage --cover-erase --cover-branches
 
 [testenv:docs]