From 71f21afe3afce5a86f9908b8854170c8c19e05c7 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@qt.io>
Date: Wed, 19 Jan 2022 09:24:44 +0100
Subject: 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
---
 qface/idl/parser/TLexer.py  | 2 +-
 qface/idl/parser/TParser.py | 2 +-
 requirements.txt            | 1 -
 requirements_minimal.txt    | 1 -
 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
diff --git a/setup.py b/setup.py
index 90c33b5..bb9fbbd 100644
--- a/setup.py
+++ b/setup.py
@@ -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',
-- 
cgit v1.2.1