From 5ff73595b6f6f803cdb1ffb502479be48aa8d3e3 Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Sun, 16 Jun 2019 01:53:39 +0200 Subject: [PATCH 1/9] fix links and impl (in qr-method) in docstrings fixes #308 --- src/escpos/escpos.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/escpos/escpos.py b/src/escpos/escpos.py index 98a6e93..bfab265 100644 --- a/src/escpos/escpos.py +++ b/src/escpos/escpos.py @@ -195,6 +195,7 @@ class Escpos(object): :param native: True to render the code on the printer, False to render the code as an image and send it to the printer (Default) :param center: Centers the code *default:* False + :param impl: Image-printing-implementation, refer to :meth:`.image()` for details """ # Basic validation if ec not in [QR_ECLEVEL_L, QR_ECLEVEL_M, QR_ECLEVEL_H, QR_ECLEVEL_Q]: @@ -306,8 +307,8 @@ class Escpos(object): .. todo:: For fixed-length standards with mandatory checksum (EAN, UPC), compute and add the checksum automatically if missing. - :param bc: barcode format, see :py:func`~escpos.Escpos.barcode` - :param code: alphanumeric data to be printed as bar code, see :py:func`~escpos.Escpos.barcode` + :param bc: barcode format, see :py:meth:`.barcode()` + :param code: alphanumeric data to be printed as bar code, see :py:meth:`.barcode()` :return: bool """ if bc not in BARCODE_FORMATS: @@ -394,7 +395,7 @@ class Escpos(object): *default*: A :param check: If this parameter is True, the barcode format will be checked to ensure it meets the bc - requirements as defigned in the esc/pos documentation. See py:func:`~escpos.Escpos.check_barcode` + requirements as defigned in the esc/pos documentation. See :py:meth:`.check_barcode()` for more information. *default*: True. :raises: :py:exc:`~escpos.exceptions.BarcodeSizeError`, From 2d0f0454576fc470bed08b3d8dea8b16d9ee150d Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Sun, 16 Jun 2019 02:03:53 +0200 Subject: [PATCH 2/9] add first draft of Windows conf for #108 --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 815eb23..b4c6c16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,13 @@ env: - ESCPOS_CAPABILITIES_FILE=/home/travis/build/python-escpos/python-escpos/capabilities-data/dist/capabilities.json matrix: include: + - name: "Python 3.7 on Windows" + os: windows + language: shell + before_install: + - choco install python + - pip install tox codecov 'sphinx>=1.5.1' + env: TOXENV=py37 PATH=/c/Python37:/c/Python37/Scripts:$PATH - python: 2.7 env: TOXENV=py27 - python: 3.4 From a6f635c0d5a9671376c95ee6e252c76f64527f79 Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Sun, 16 Jun 2019 02:27:32 +0200 Subject: [PATCH 3/9] fix capabilities file --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4c6c16..54dd149 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,10 @@ matrix: before_install: - choco install python - pip install tox codecov 'sphinx>=1.5.1' - env: TOXENV=py37 PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: + - TOXENV=py37 + - PATH=/c/Python37:/c/Python37/Scripts:$PATH + - ESCPOS_CAPABILITIES_FILE=C:/Users/travis/build/python-escpos/python-escpos/capabilities-data/dist/capabilities.json - python: 2.7 env: TOXENV=py27 - python: 3.4 From 2d7458fa491c9aeb0e81c562e42765608c786151 Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Sun, 16 Jun 2019 02:47:46 +0200 Subject: [PATCH 4/9] activate fast_finish --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 54dd149..0aabbb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: global: - ESCPOS_CAPABILITIES_FILE=/home/travis/build/python-escpos/python-escpos/capabilities-data/dist/capabilities.json matrix: + fast_finish: true include: - name: "Python 3.7 on Windows" os: windows @@ -50,11 +51,13 @@ matrix: - python: 3.7 env: TOXENV=flake8 allow_failures: + - python: 2.7 - python: 3.6-dev - python: 3.7-dev - python: 3.8-dev - python: nightly - python: pypy3 + - os: windows before_install: - pip install tox codecov 'sphinx>=1.5.1' - ./doc/generate_authors.sh --check From e50e295acccf5d9186b5e196f9df44c242519546 Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Sun, 16 Jun 2019 03:01:36 +0200 Subject: [PATCH 5/9] add osx --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0aabbb0..fcf5088 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,10 @@ matrix: - TOXENV=py37 - PATH=/c/Python37:/c/Python37/Scripts:$PATH - ESCPOS_CAPABILITIES_FILE=C:/Users/travis/build/python-escpos/python-escpos/capabilities-data/dist/capabilities.json + - name: "Python 3.7 on macOS" + os: osx + osx_image: xcode10.2 + language: shell - python: 2.7 env: TOXENV=py27 - python: 3.4 @@ -57,7 +61,7 @@ matrix: - python: 3.8-dev - python: nightly - python: pypy3 - - os: windows + - os: windows osx before_install: - pip install tox codecov 'sphinx>=1.5.1' - ./doc/generate_authors.sh --check From 46942820a5cce3b3a7a92c23317490d6c736d6ba Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Sun, 16 Jun 2019 03:05:42 +0200 Subject: [PATCH 6/9] update env variables --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fcf5088..9d9e19b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ matrix: os: osx 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: 2.7 env: TOXENV=py27 - python: 3.4 From c5e46a888da165f2561f6a054bf240fe25f6a685 Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Sun, 16 Jun 2019 03:08:19 +0200 Subject: [PATCH 7/9] fix allowed failures --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d9e19b..b31199d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,8 @@ matrix: - python: 3.8-dev - python: nightly - python: pypy3 - - os: windows osx + - os: windows + - os: osx before_install: - pip install tox codecov 'sphinx>=1.5.1' - ./doc/generate_authors.sh --check From 2d97c0bbbd712bf7cb269d215b50c7c0be869eea Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Wed, 19 Jun 2019 14:14:59 +0200 Subject: [PATCH 8/9] improve package structure with capabilities file --- MANIFEST.in | 1 - setup.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 3b066a0..f1666ca 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,5 @@ include *.rst include *.txt -include COPYING include LICENSE include INSTALL include tox.ini diff --git a/setup.py b/setup.py index a09bc83..7220055 100755 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ setup( platforms='any', package_dir={"": "src"}, packages=find_packages(where="src", exclude=["tests", "tests.*"]), - package_data={'': ['COPYING', 'src/escpos/capabilities.json']}, + package_data={'escpos': ['capabilities.json']}, include_package_data=True, classifiers=[ 'Development Status :: 4 - Beta', From 46429b1092c639d9b7fbee8b1be389b830907977 Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Wed, 19 Jun 2019 14:39:19 +0200 Subject: [PATCH 9/9] update changelog --- CHANGELOG.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index abae03f..d823f07 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,22 @@ ********* Changelog ********* +2019-06-19 - Version 3.0a6 - "Mistake not..." +--------------------------------------------- +This release is the seventh alpha release of the new version 3.0. +Please be aware the the API is subject to change until v3.0 is +released. + +changes +^^^^^^^ +- fix inclusion of the capabilities-file +- execute CI jobs also on Windows and macOS-targets +- improve documentation + +contributors +^^^^^^^^^^^^ +- Patrick Kanzler + 2019-06-16 - Version 3.0a5 - "Lightly Seared On The Reality Grill" ------------------------------------------------------------------ This release is the sixth alpha release of the new version 3.0. Please