diff options
author | Dominik Holland <dominik.holland@qt.io> | 2022-01-19 09:24:44 +0100 |
---|---|---|
committer | Dominik Holland <dominik.holland@googlemail.com> | 2022-01-27 13:50:04 +0100 |
commit | 71f21afe3afce5a86f9908b8854170c8c19e05c7 (patch) | |
tree | 5a1d662ead1da6ca3c839709e90cb7d16e29b736 | |
parent | 8b267658200e087722eb9d70c31aec0d4be04a86 (diff) | |
download | qtivi-qface-71f21afe3afce5a86f9908b8854170c8c19e05c7.tar.gz |
Replace usage of 'typing.io' by 'typing'
With python 3.5 typing.io was integrated into the core libraries and
no additional package is needed in order to use it.
This also sets python 3.5 as the minimum version.
Fixes: #104
-rw-r--r-- | qface/idl/parser/TLexer.py | 2 | ||||
-rw-r--r-- | qface/idl/parser/TParser.py | 2 | ||||
-rw-r--r-- | requirements.txt | 1 | ||||
-rw-r--r-- | requirements_minimal.txt | 1 | ||||
-rw-r--r-- | setup.py | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/qface/idl/parser/TLexer.py b/qface/idl/parser/TLexer.py index efcbc1e..a74610d 100644 --- a/qface/idl/parser/TLexer.py +++ b/qface/idl/parser/TLexer.py @@ -1,7 +1,7 @@ # Generated from T.g4 by ANTLR 4.7.1 from antlr4 import * from io import StringIO -from typing.io import TextIO +from typing import TextIO import sys diff --git a/qface/idl/parser/TParser.py b/qface/idl/parser/TParser.py index be85f81..1625377 100644 --- a/qface/idl/parser/TParser.py +++ b/qface/idl/parser/TParser.py @@ -2,7 +2,7 @@ # encoding: utf-8 from antlr4 import * from io import StringIO -from typing.io import TextIO +from typing import TextIO import sys def serializedATN(): diff --git a/requirements.txt b/requirements.txt index 82601fc..781a230 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,6 @@ path.py>=11.0.1 pathtools>=0.1.2 PyYAML>=5.1 six>=1.11.0 -typing>=3.6.4 watchdog>=0.8.3 pytest>=5.3.5 pytest-cov>=2.8.1 diff --git a/requirements_minimal.txt b/requirements_minimal.txt index 5225362..467f295 100644 --- a/requirements_minimal.txt +++ b/requirements_minimal.txt @@ -9,7 +9,6 @@ path.py==11.0.1 pathtools==0.1.2 PyYAML==5.1 six==1.11.0 -typing==3.6.4 watchdog==0.8.3 pytest==5.3.5 pytest-cov==2.8.1 @@ -44,13 +44,13 @@ setup( keywords='qt code generator framework', packages=find_packages(), include_package_data=True, + python_requires=">=3.5", install_requires=[ 'click>=6.7', 'antlr4-python3-runtime>=4.7.1', 'jinja2>=2.10.3', 'path.py>=11.0.1', 'pyyaml>=5.1', - 'typing>=3.6.4', 'watchdog>=0.8.3', 'six>=1.11.0', 'coloredlogs>=10.0', |