Merge branch 'master' into development

setup.cfg

@@ -1,3 +1,64 @@
+[metadata]
+name = python-escpos
+url = https://github.com/python-escpos/python-escpos
+description = Python library to manipulate ESC/POS Printers
+long_description = file: README.rst
+license = MIT
+license_file = LICENSE
+author = Manuel F Martinez and others
+author_email = dev@pkanzler.de
+maintainer = Patrick Kanzler
+maintainer_email = dev@pkanzler.de
+keywords = ESC/POS, thermoprinter, voucher printer, printing, receipt
+classifiers =
+    Development Status :: 4 - Beta
+    Environment :: Console
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: Implementation :: CPython
+    Topic :: Software Development :: Libraries :: Python Modules
+    Topic :: Office/Business :: Financial :: Point-Of-Sale
+project_urls =
+    Bug Tracker = https://github.com/python-escpos/python-escpos/issues
+    Documentation = https://python-escpos.readthedocs.io/en/latest/
+    Release Notes = https://github.com/python-escpos/python-escpos/releases
+
+[options]
+python_requires = >=3.5
+zip_safe = false
+include_package_data = true
+install_requires =
+    pyusb>=1.0.0
+    Pillow>=2.0
+    qrcode>=4.0
+    pyserial
+    six
+    appdirs
+    PyYAML
+    argparse
+    argcomplete
+    future
+    viivakoodi>=0.8
+setup_requires = setuptools_scm
+tests_require =
+    jaconv
+    tox
+    pytest!=3.2.0,!=3.3.0
+    pytest-cov
+    pytest-mock
+    nose
+    scripttest
+    mock
+    hypothesis>4
+    flake8
+
 [nosetests]
 verbosity=3
 with-doctest=1

setup.py

@@ -32,79 +32,13 @@ version = '{version}'
 
 
 setup(
-    name='python-escpos',
     use_scm_version={
-        'write_to': 'src/escpos/version.py',
+        "write_to": "src/escpos/version.py",
-        'write_to_template': setuptools_scm_template,
+        "write_to_template": setuptools_scm_template,
     },
-    url='https://github.com/python-escpos/python-escpos',
+    platforms="any",
-    download_url='https://github.com/python-escpos/python-escpos/archive/master.zip',
-    description='Python library to manipulate ESC/POS Printers',
-    license='MIT',
-    long_description=read('README.rst'),
-    author='Manuel F Martinez and others',
-    author_email='manpaz@bashlinux.com',
-    maintainer='Patrick Kanzler',
-    maintainer_email='dev@pkanzler.de',
-    keywords=[
-        'ESC/POS',
-        'thermoprinter',
-        'voucher printer',
-        'printing',
-        'receipt,',
-    ],
-    platforms='any',
     package_dir={"": "src"},
     packages=find_packages(where="src", exclude=["tests", "tests.*"]),
-    package_data={'escpos': ['capabilities.json']},
+    package_data={"escpos": ["capabilities.json"]},
-    include_package_data=True,
+    entry_points={"console_scripts": ["python-escpos = escpos.cli:main"]},
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'Topic :: Office/Business :: Financial :: Point-Of-Sale',
-    ],
-    install_requires=[
-        'pyusb>=1.0.0',
-        'Pillow>=2.0',
-        'qrcode>=4.0',
-        'pyserial',
-        'six',
-        'appdirs',
-        'PyYAML',
-        'argparse',
-        'argcomplete',
-        'future',
-        'viivakoodi>=0.8'
-    ],
-    setup_requires=[
-        'setuptools_scm',
-    ],
-    tests_require=[
-        'jaconv',
-        'tox',
-        'pytest!=3.2.0,!=3.3.0',
-        'pytest-cov',
-        'pytest-mock',
-        'nose',
-        'scripttest',
-        'mock',
-        'hypothesis>4',
-        'flake8'
-    ],
-    entry_points={
-        'console_scripts': [
-            'python-escpos = escpos.cli:main'
-        ]
-    },
 )