1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-03 03:50:58 +00:00

build: drop python<3.5 compatibility in CI and markers

This commit is contained in:
matejcik 2018-10-01 13:52:41 +02:00
parent 15d3b0c722
commit 7b98b5ac7c
4 changed files with 4 additions and 6 deletions

View File

@ -21,6 +21,7 @@ env:
python: python:
- "3.5" - "3.5"
- "3.6" - "3.6"
- "3.7"
install: install:
# Optimisation: build requirements as wheels, which get cached by Travis # Optimisation: build requirements as wheels, which get cached by Travis
@ -38,7 +39,7 @@ before_script:
script: script:
- python setup.py install - 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 - tox
notifications: notifications:

View File

@ -5,4 +5,3 @@ click>=6.2
pyblake2>=0.9.3 pyblake2>=0.9.3
libusb1>=1.6.4 libusb1>=1.6.4
construct>=2.9 construct>=2.9
typing>=3.0.0; python_version < '3.5'

View File

@ -130,11 +130,10 @@ setup(
scripts=["trezorctl"], scripts=["trezorctl"],
install_requires=install_requires, install_requires=install_requires,
extras_require={ extras_require={
':python_version < "3.5"': ["typing>=3.0.0"],
"hidapi": ["hidapi>=0.7.99.post20"], "hidapi": ["hidapi>=0.7.99.post20"],
"ethereum": ["rlp>=0.4.4", "ethjsonrpc>=0.3.0"], "ethereum": ["rlp>=0.4.4", "ethjsonrpc>=0.3.0"],
}, },
python_requires=">=3.3", python_requires=">=3.5",
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
classifiers=[ classifiers=[

View File

@ -1,9 +1,8 @@
[tox] [tox]
envlist = envlist =
py33,
py34,
py35, py35,
py36, py36,
py37,
[testenv] [testenv]
deps = deps =