From 599bd6c9e41af2954dfd654f1adc72d7cd8f3e66 Mon Sep 17 00:00:00 2001
From: Romain Porte <microjoe@microjoe.org>
Date: Mon, 7 Oct 2019 07:25:28 +0200
Subject: [PATCH] barcodes: replace viivakoodi with python-barcode

python-barcode is yet another clone of the PyPI barcode library, but
which is still developped compared to viivakoodi.

The author provides Python 3.7 support in the last release, which is a
nice to have.  However, since this dependency requires at least Python
3.5, we have to align our minimum supported version to 3.5 too, and drop
near EOL Python 2.7 support.

Signed-off-by: Romain Porte <microjoe@microjoe.org>
---
 .travis.yml          | 2 --
 README.rst           | 2 +-
 doc/requirements.txt | 2 +-
 setup.py             | 3 +--
 tox.ini              | 6 +++---
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5311ecf..3ea9ff5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,6 @@ matrix:
       osx_image: xcode10.2
       language: shell
       env: TOXENV=py37 ESCPOS_CAPABILITIES_FILE=/Users/travis/build/python-escpos/python-escpos/capabilities-data/dist/capabilities.json
-    - python: 3.4
-      env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
     - python: 3.6
diff --git a/README.rst b/README.rst
index 3eebf6d..1cf2e6c 100644
--- a/README.rst
+++ b/README.rst
@@ -47,7 +47,7 @@ This library makes use of:
 * `Pillow <https://github.com/python-pillow/Pillow>`_ for image printing
 * `qrcode <https://github.com/lincolnloop/python-qrcode>`_ for the generation of QR-codes
 * `pyserial <https://github.com/pyserial/pyserial>`_ for serial printers
-* `viivakoodi <https://github.com/kxepal/viivakoodi>`_ for the generation of barcodes
+* `python-barcode <https://github.com/WhyNotHugo/python-barcode>`_ for the generation of barcodes
 
 Documentation and Usage
 -----------------------
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 9f38356..89cd833 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -5,4 +5,4 @@ pyserial
 sphinx-rtd-theme
 setuptools-scm
 docutils>=0.12
-viivakoodi
+python-barcode>=0.11.0,<1
diff --git a/setup.py b/setup.py
index 631787e..5f5e11f 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,6 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
@@ -82,7 +81,7 @@ setup(
         'argparse',
         'argcomplete',
         'future',
-        'viivakoodi>=0.8'
+        'python-barcode>=0.9.1,<1'
     ],
     setup_requires=[
         'setuptools_scm',
diff --git a/tox.ini b/tox.ini
index 723ddf9..48b07b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34, py35, py36, py37, docs, flake8
+envlist = py35, py36, py37, docs, flake8
 
 [testenv]
 deps = nose
@@ -11,7 +11,7 @@ deps = nose
        pytest-cov
        pytest-mock
        hypothesis!=3.56.9,<4
-       viivakoodi
+       python-barcode
 commands = py.test --cov escpos
 passenv = ESCPOS_CAPABILITIES_PICKLE_DIR ESCPOS_CAPABILITIES_FILE CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_*
 
@@ -20,7 +20,7 @@ basepython = python
 changedir = doc
 deps = sphinx>=1.5.1
        setuptools_scm
-       viivakoodi
+       python-barcode
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html
 
 [testenv:flake8]