diff --git a/.travis.yml b/.travis.yml index 6316c8ad2c..901f6fbab0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ env: python: - "3.5" - "3.6" + - "3.7" install: # Optimisation: build requirements as wheels, which get cached by Travis @@ -38,7 +39,7 @@ before_script: script: - python setup.py install - - if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then make stylecheck; fi + - if [ $TRAVIS_PYTHON_VERSION != 3.5 ]; then make stylecheck; fi - tox notifications: diff --git a/requirements.txt b/requirements.txt index 3a5efbd52d..37a872ff68 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,3 @@ click>=6.2 pyblake2>=0.9.3 libusb1>=1.6.4 construct>=2.9 -typing>=3.0.0; python_version < '3.5' diff --git a/setup.py b/setup.py index 7322ef2e10..32a08c18b4 100755 --- a/setup.py +++ b/setup.py @@ -130,11 +130,10 @@ setup( scripts=["trezorctl"], install_requires=install_requires, extras_require={ - ':python_version < "3.5"': ["typing>=3.0.0"], "hidapi": ["hidapi>=0.7.99.post20"], "ethereum": ["rlp>=0.4.4", "ethjsonrpc>=0.3.0"], }, - python_requires=">=3.3", + python_requires=">=3.5", include_package_data=True, zip_safe=False, classifiers=[ diff --git a/tox.ini b/tox.ini index 06c2b1d247..9e6f10db39 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] envlist = - py33, - py34, py35, py36, + py37, [testenv] deps =