Merge branch 'master' into python-barcode

This commit is contained in:
Patrick Kanzler 2020-05-09 01:55:21 +02:00 committed by GitHub
commit ee7ebd43fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 75 additions and 29 deletions

View File

@ -19,6 +19,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1 uses: actions/setup-python@v1
with: with:
@ -26,7 +28,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install flake8 pytest pip install flake8 pytest tox tox-gh-actions
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Lint with flake8 - name: Lint with flake8
run: | run: |
@ -34,6 +36,8 @@ jobs:
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest - name: Test with tox
run: | run: |
tox tox
env:
ESCPOS_CAPABILITIES_FILE: /home/runner/work/python-escpos/python-escpos/capabilities-data/dist/capabilities.json

3
.gitignore vendored
View File

@ -29,3 +29,6 @@ test/test-cli-output/
*.swp *.swp
*.swn *.swn
*.swo *.swo
# vscode
.vscode/settings.json

View File

@ -1,7 +1,7 @@
language: python language: python
sudo: false sudo: false
cache: pip cache: pip
dist: xenial dist: bionic
git: git:
depth: 100000 depth: 100000
addons: addons:
@ -33,27 +33,23 @@ matrix:
env: TOXENV=py35 env: TOXENV=py35
- python: 3.6 - python: 3.6
env: TOXENV=py36 env: TOXENV=py36
- python: 3.6-dev
env: TOXENV=py36
- python: 3.7 - python: 3.7
env: TOXENV=py37 env: TOXENV=py37
- python: 3.7-dev - python: 3.7-dev
env: TOXENV=py37 env: TOXENV=py37
- python: 3.8
env: TOXENV=py38
- python: 3.8-dev - python: 3.8-dev
env: TOXENV=py38 env: TOXENV=py38
- python: nightly - python: nightly
env: TOXENV=py38 env: TOXENV=py38
- python: pypy
env: TOXENV=pypy
- python: pypy3 - python: pypy3
env: TOXENV=pypy3 env: TOXENV=pypy3
- python: 3.7 - python: 3.8
env: TOXENV=docs env: TOXENV=docs
- python: 3.7 - python: 3.8
env: TOXENV=flake8 env: TOXENV=flake8
allow_failures: allow_failures:
- python: 2.7
- python: 3.6-dev
- python: 3.7-dev - python: 3.7-dev
- python: 3.8-dev - python: 3.8-dev
- python: nightly - python: nightly
@ -82,4 +78,4 @@ deploy:
tags: true tags: true
repo: python-escpos/python-escpos repo: python-escpos/python-escpos
branch: master branch: master
condition: $TRAVIS_PYTHON_VERSION = "3.7" condition: $TRAVIS_PYTHON_VERSION = "3.8"

16
.vscode/tasks.json vendored Normal file
View File

@ -0,0 +1,16 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "test with tox",
"type": "shell",
"command": "tox",
"group": {
"kind": "test",
"isDefault": true
}
}
]
}

View File

@ -1,10 +1,35 @@
********* *********
Changelog Changelog
********* *********
2020-05-09 - Version 3.0a7 - "No Fixed Abode"
---------------------------------------------
This release is the eight alpha release of the new version 3.0.
Please be aware that the API is subject to change until v3.0
is released.
This release also marks the point at which the project transitioned
to having only a master-branch (and not an additional development branch).
changes
^^^^^^^
- add Exception for NotImplementedError in detach_kernel_driver
- update installation information
- update and improve documentation
- add error handling to image centering flag
- update and fix tox and CI environment, preparing drop of support for Python 2
contributors
^^^^^^^^^^^^
- Alexander Bougakov
- Brian
- Yaisel Hurtado
- Maximilan Wagenbach
- Patrick Kanzler
2019-06-19 - Version 3.0a6 - "Mistake not..." 2019-06-19 - Version 3.0a6 - "Mistake not..."
--------------------------------------------- ---------------------------------------------
This release is the seventh alpha release of the new version 3.0. 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 Please be aware that the API is subject to change until v3.0 is
released. released.
changes changes

View File

@ -37,12 +37,9 @@ Apart from that the travis-log and the check by Landscape will provide you with
GIT GIT
^^^ ^^^
The master-branch contains code that has been released to PyPi. A release is marked with a tag The master-branch contains the main development of the project. A release to PyPi is marked with a tag
corresponding to the version. Issues are closed when they have been resolved in the development-branch. corresponding to the version. Issues are closed when they have been resolved by merging into the master-branch.
When you have a change to make, begin by creating a new branch from the HEAD of `python-escpos/master`.
When you have a change to make, begin by creating a new branch from the HEAD of `python-escpos/development`.
Name your branch to indicate what you are trying to achieve. Good branch names might
be `improve/text-handling`, `feature/enable-color-printing`.
Please try to group your commits into logical units. If you need to tidy up your branch, you can make use of a Please try to group your commits into logical units. If you need to tidy up your branch, you can make use of a
git feature called an 'interactive rebase' before making a pull request. A small, self-contained change-set is git feature called an 'interactive rebase' before making a pull request. A small, self-contained change-set is

View File

@ -4,6 +4,7 @@ include LICENSE
include INSTALL include INSTALL
include tox.ini include tox.ini
include capabilities-data/dist/capabilities.json include capabilities-data/dist/capabilities.json
include src/escpos/capabilities.json
recursive-include doc *.bat recursive-include doc *.bat
recursive-include doc *.ico recursive-include doc *.ico
recursive-include doc *.py recursive-include doc *.py

@ -1 +1 @@
Subproject commit 8885283d71a43758aa63d633fd2301df13dce9d5 Subproject commit 3b5b35cfd35d297f9085ec16d47d1f77c3f1e768

View File

@ -3,5 +3,5 @@ formats:
- epub - epub
requirements_file: doc/requirements.txt requirements_file: doc/requirements.txt
python: python:
version: 2 version: 3
setup_py_install: true setup_py_install: true

View File

@ -65,8 +65,8 @@ setup(
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Office/Business :: Financial :: Point-Of-Sale', 'Topic :: Office/Business :: Financial :: Point-Of-Sale',
], ],
@ -95,7 +95,7 @@ setup(
'nose', 'nose',
'scripttest', 'scripttest',
'mock', 'mock',
'hypothesis!=3.56.9,<4', 'hypothesis>4',
'flake8' 'flake8'
], ],
entry_points={ entry_points={

View File

@ -24,7 +24,6 @@ else:
@pytest.mark.skip("this test is broken and has to be fixed or discarded") @pytest.mark.skip("this test is broken and has to be fixed or discarded")
@settings(use_coverage=False)
@given(path=text()) @given(path=text())
def test_load_file_printer(mocker, path): def test_load_file_printer(mocker, path):
"""test the loading of the file-printer""" """test the loading of the file-printer"""
@ -36,7 +35,6 @@ def test_load_file_printer(mocker, path):
@pytest.mark.skip("this test is broken and has to be fixed or discarded") @pytest.mark.skip("this test is broken and has to be fixed or discarded")
@settings(deadline=None, use_coverage=False)
@given(txt=text()) @given(txt=text())
def test_auto_flush(mocker, txt): def test_auto_flush(mocker, txt):
"""test auto_flush in file-printer""" """test auto_flush in file-printer"""
@ -58,7 +56,6 @@ def test_auto_flush(mocker, txt):
@pytest.mark.skip("this test is broken and has to be fixed or discarded") @pytest.mark.skip("this test is broken and has to be fixed or discarded")
@settings(deadline=None, use_coverage=False)
@given(txt=text()) @given(txt=text())
def test_flush_on_close(mocker, txt): def test_flush_on_close(mocker, txt):
"""test flush on close in file-printer""" """test flush on close in file-printer"""

13
tox.ini
View File

@ -1,5 +1,12 @@
[tox] [tox]
envlist = py35, py36, py37, docs, flake8 envlist = py35, py36, py37, py38, docs, flake8
[gh-actions]
python =
2.7: py27
3.6: py36
3.7: py37
3.8: py38
[testenv] [testenv]
deps = nose deps = nose
@ -10,9 +17,9 @@ deps = nose
pytest!=3.2.0,!=3.3.0 pytest!=3.2.0,!=3.3.0
pytest-cov pytest-cov
pytest-mock pytest-mock
hypothesis!=3.56.9,<4 hypothesis>4
python-barcode python-barcode
commands = py.test --cov escpos commands = pytest --cov escpos
passenv = ESCPOS_CAPABILITIES_PICKLE_DIR ESCPOS_CAPABILITIES_FILE CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_* passenv = ESCPOS_CAPABILITIES_PICKLE_DIR ESCPOS_CAPABILITIES_FILE CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_*
[testenv:docs] [testenv:docs]