From fbb485445331a1aceef78822f37bb780b00d9170 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Mon, 21 Mar 2022 15:33:36 +0800
Subject: [PATCH] fix #1165: ImportError caused by jinja2 version

---
 docs/CHANGELOG.md |  5 +++--
 poetry.lock       | 14 +++++++-------
 pyproject.toml    |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 133565ac..e565afcd 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 ## 3.1.7 (2022-03-21)
 
-- fix: ignore comments and blank lines when parsing .env file
+- fix #1117: ignore comments and blank lines when parsing .env file
+- fix #1141: parameterize failure caused by pydantic version
+- fix #1165: ImportError caused by jinja2 version
 - fix: failure in getting client and server IP/port when requesting HTTPS
 - fix: upgrade dependencies for security
-- fix: parameterize failure caused by pydantic version
 - change: upgrade python support version to ^3.7
 
 ## 3.1.6 (2021-07-18)
diff --git a/poetry.lock b/poetry.lock
index aac3c0e4..2b494b11 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -474,17 +474,17 @@ reference = "tsinghua"
 
 [[package]]
 name = "jinja2"
-version = "2.11.3"
+version = "3.0.3"
 description = "A very fast and expressive template engine."
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.6"
 
 [package.dependencies]
-MarkupSafe = ">=0.23"
+MarkupSafe = ">=2.0"
 
 [package.extras]
-i18n = ["Babel (>=0.8)"]
+i18n = ["Babel (>=2.7)"]
 
 [package.source]
 type = "legacy"
@@ -1165,7 +1165,7 @@ upload = ["requests-toolbelt", "filetype"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "a822ce5885d150e332076e7600bd3cd840aa48911ca1c9456b540136136f727a"
+content-hash = "e88a29114170c024f84dd0685455573623a8c60d9d10e0fcdf99a91c26ece954"
 
 [metadata.files]
 allure-pytest = [
@@ -1540,8 +1540,8 @@ itsdangerous = [
     {file = "itsdangerous-2.1.1.tar.gz", hash = "sha256:7b7d3023cd35d9cb0c1fd91392f8c95c6fa02c59bf8ad64b8849be3401b95afb"},
 ]
 jinja2 = [
-    {file = "Jinja2-2.11.3-py2.py3-none-any.whl", hash = "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419"},
-    {file = "Jinja2-2.11.3.tar.gz", hash = "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"},
+    {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"},
+    {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"},
 ]
 jmespath = [
     {file = "jmespath-0.9.5-py2.py3-none-any.whl", hash = "sha256:695cb76fa78a10663425d5b73ddc5714eb711157e52704d69be03b1a02ba4fec"},
diff --git a/pyproject.toml b/pyproject.toml
index f44ceeb3..c75b7bda 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,6 @@ include = ["docs/CHANGELOG.md"]
 python = "^3.7"
 requests = "^2.22.0"
 pyyaml = "^5.4.1"
-jinja2 = "^2.10.3"
 pydantic = "~1.8"   # >=1.8.0 <1.9.0
 loguru = "^0.4.1"
 jmespath = "^0.9.5"
@@ -45,6 +44,7 @@ requests-toolbelt = {version = "^0.9.1", optional = true}
 filetype = {version = "^1.0.7", optional = true}
 locust = {version = "^1.0.3", optional = true}
 Brotli = "^1.0.9"
+jinja2 = "^3.0.3"
 
 [tool.poetry.extras]
 allure = ["allure-pytest"]                  # pip install "httprunner[allure]", poetry install -E allure