From 97bbf905cbd150dd999d1811afb60871027b7443 Mon Sep 17 00:00:00 2001
From: Fabrice Reix <fabrice.reix@orange.com>
Date: Wed, 24 Aug 2022 14:18:49 +0200
Subject: [PATCH] Move/Update requirements.txt

---
 .circleci/config.yml                         | 2 +-
 .github/workflows/test.yml                   | 2 +-
 {integration => bin}/requirements-frozen.txt | 8 ++++++++
 {integration => bin}/requirements.txt        | 2 ++
 bin/test/bench.sh                            | 2 +-
 bin/test/test_prerequisites.sh               | 2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)
 rename {integration => bin}/requirements-frozen.txt (81%)
 rename {integration => bin}/requirements.txt (64%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6effea60a..5494f7481 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,7 +26,7 @@ jobs:
           name: Tests units and integration tests
           command: |
             python3 -m pip install --upgrade pip --quiet
-            pip3 install --requirement integration/requirements-frozen.txt
+            pip3 install --requirement bin/requirements-frozen.txt
             mitmdump --version
             export PATH="$PWD/target/debug:$PATH"
             cd integration
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e1258077e..a36fd7cf3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -208,7 +208,7 @@ jobs:
         if (Test-Path C:\vcpkg\installed) {vcpkg update} else {vcpkg install libxml2:x64-windows}
         vcpkg integrate install
         # install proxy and server
-        pip3 install --requirement integration/requirements-frozen.txt
+        pip3 install --requirement bin/requirements-frozen.txt
     - name: Run Tests units
       run: |
         cd .\integration
diff --git a/integration/requirements-frozen.txt b/bin/requirements-frozen.txt
similarity index 81%
rename from integration/requirements-frozen.txt
rename to bin/requirements-frozen.txt
index acc07c383..309f2492d 100644
--- a/integration/requirements-frozen.txt
+++ b/bin/requirements-frozen.txt
@@ -5,6 +5,7 @@ Brotli==1.0.9
 bs4==0.0.1
 certifi==2021.10.8
 cffi==1.15.0
+charset-normalizer==2.1.1
 click==8.1.2
 cryptography==36.0.2
 Flask==2.0.3
@@ -12,6 +13,7 @@ h11==0.13.0
 h2==4.1.0
 hpack==4.0.0
 hyperframe==6.0.1
+idna==3.3
 itsdangerous==2.1.2
 Jinja2==3.1.1
 kaitaistruct==0.9
@@ -20,6 +22,8 @@ lxml==4.9.1
 MarkupSafe==2.1.1
 mitmproxy==8.0.0
 msgpack==1.0.3
+mypy==0.971
+mypy-extensions==0.4.3
 passlib==1.7.4
 protobuf==3.19.4
 publicsuffix2==2.20191221
@@ -28,11 +32,15 @@ pycparser==2.21
 pyOpenSSL==22.0.0
 pyparsing==3.0.7
 pyperclip==1.8.2
+requests==2.28.1
 ruamel.yaml==0.17.21
 ruamel.yaml.clib==0.2.6
 sortedcontainers==2.4.0
 soupsieve==2.3.2.post1
+tomli==2.0.1
 tornado==6.1
+typing_extensions==4.3.0
+urllib3==1.26.12
 urwid==2.1.2
 Werkzeug==2.0.3
 wsproto==1.1.0
diff --git a/integration/requirements.txt b/bin/requirements.txt
similarity index 64%
rename from integration/requirements.txt
rename to bin/requirements.txt
index 3d3492f11..9340cf10e 100644
--- a/integration/requirements.txt
+++ b/bin/requirements.txt
@@ -2,3 +2,5 @@ Flask==2.0.3
 Werkzeug==2.0.3
 bs4==0.0.1
 lxml==4.9.1
+requests==2.28.1
+mypy==0.971
diff --git a/bin/test/bench.sh b/bin/test/bench.sh
index 8df4d0372..0e49eaae6 100755
--- a/bin/test/bench.sh
+++ b/bin/test/bench.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 export PATH="$PWD/target/release:$PATH"
-pip3 install --requirement integration/requirements-frozen.txt
+pip3 install --requirement bin/requirements-frozen.txt
 cd bench || exit 1
 python3 server.py >server.log 2>&1 &
 sleep 2
diff --git a/bin/test/test_prerequisites.sh b/bin/test/test_prerequisites.sh
index 4379e95a2..0cb203a6e 100755
--- a/bin/test/test_prerequisites.sh
+++ b/bin/test/test_prerequisites.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 echo "----- install servers prerequisites -----"
-pip3 install --requirement integration/requirements-frozen.txt
+pip3 install --requirement bin/requirements-frozen.txt
 echo "----- start servers -----"
 cd integration
 python3 server.py >server.log 2>&1 &