From f649814091007e88dfd3bf0125d43754d81543f2 Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Mon, 14 May 2018 18:06:31 +0200 Subject: [PATCH] Fix travis-builds and tests in general (#295) * add explicit location of capabilities.json for travis * pass on env variables in tox builds * drop support for python 3.3 and remove python3.3 from supported versions list --- .travis.yml | 10 +++++++--- setup.py | 1 - tox.ini | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8fca72..e871b54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,13 @@ addons: apt: packages: - graphviz +env: + global: + - ESCPOS_CAPABILITIES_FILE=/home/travis/build/python-escpos/python-escpos/capabilities-data/dist/capabilities.json matrix: include: - python: 2.7 env: TOXENV=py27 - - python: 3.3 - env: TOXENV=py33 - python: 3.4 env: TOXENV=py34 - python: 3.5 @@ -21,6 +22,8 @@ matrix: env: TOXENV=py36 - python: 3.6-dev env: TOXENV=py36 + - python: 3.7-dev + env: TOXENV=py37 - python: nightly env: TOXENV=py37 - python: pypy @@ -35,6 +38,7 @@ matrix: env: TOXENV=flake8 allow_failures: - python: 3.6-dev + - python: 3.7-dev - python: nightly - python: pypy3 before_install: @@ -59,4 +63,4 @@ deploy: tags: true repo: python-escpos/python-escpos branch: master - condition: $TRAVIS_PYTHON_VERSION = "3.5" + condition: $TRAVIS_PYTHON_VERSION = "3.6" diff --git a/setup.py b/setup.py index 384da8b..bd92196 100755 --- a/setup.py +++ b/setup.py @@ -96,7 +96,6 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', diff --git a/tox.ini b/tox.ini index 6142681..142ca43 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ deps = nose hypothesis!=3.56.9 viivakoodi commands = py.test --cov escpos +passenv = ESCPOS_CAPABILITIES_PICKLE_DIR ESCPOS_CAPABILITIES_FILE CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_* [testenv:docs] basepython = python