From a333f097799fb27a3d085527ffa8f8edd44c168a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=8F=9C?= <lihuacai168@users.noreply.github.com>
Date: Thu, 22 Feb 2024 21:05:36 +0800
Subject: [PATCH] Merge pull request #181

* chore: compatible py3.10 3.11,upgrade image to 3.11

* docs: python version

* Merge branch 'master' into chore/py3.10-3.11
---
 Dockerfile           | 6 +++---
 README.md            | 4 +++-
 httprunner/report.py | 2 +-
 requirements.txt     | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 276c77d0..3c141f60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-buster as Base
+FROM python:3.11-buster as Base
 
 
 
@@ -21,7 +21,7 @@ RUN apt-get update && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
 
-FROM python:3.9-buster
+FROM python:3.11-buster
 ENV TZ=Asia/Shanghai
 
 ARG DEBIAN_REPO="deb.debian.org"
@@ -39,7 +39,7 @@ RUN apt-get update && \
     echo $TZ > /etc/timezone && \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=Base /usr/local/lib/python3.9/site-packages /usr/local/lib/python3.9/site-packages
+COPY --from=Base /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
 WORKDIR /app
 COPY . /app
 RUN chmod +x /app/start.sh
diff --git a/README.md b/README.md
index 71b0cfd8..e7604b04 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,9 @@
 
 
 # 注意
-> 只能使用`python3.9`版本
+> python版本需要>=3.9 
+> 
+> 3.9, 3.10和3.11都经过测试
  
 # 文档
 - 使用文档 https://www.yuque.com/lihuacai/fasterunner
diff --git a/httprunner/report.py b/httprunner/report.py
index 0e4d4846..22575d7b 100644
--- a/httprunner/report.py
+++ b/httprunner/report.py
@@ -7,7 +7,7 @@
 import time
 import unittest
 from base64 import b64encode
-from collections import Iterable
+from typing import Iterable
 from datetime import datetime
 
 from jinja2 import Template, escape
diff --git a/requirements.txt b/requirements.txt
index 38819548..c0749b51 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -45,6 +45,7 @@ requests-toolbelt==0.9.1
 simplejson==3.17.0
 six==1.15.0
 sqlparse==0.3.1
+tornado==6.4
 uritemplate==3.0.1
 urllib3==1.25.7
 #uWSGI==2.0.18