Update mitmproxy+cryptography pipfile + pyproject

bretfourbe · Oct 20, 2023 · 68bff0f · 68bff0f
1 parent 4e9d43f
commit 68bff0f
Show file tree

Hide file tree

Showing 7 changed files with 743 additions and 696 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,13 +13,13 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -e .
-          pip install "pylint==2.11.1"
-          pip install "pylint-ignore==2021.1020"
+          pip install "pylint==2.12.2"
+          pip install "pylint-ignore==2022.1025"
       - name: Pylint
         run: |
           pylint-ignore --rcfile=.pylintrc wapitiCore
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/INSTALL.md b/INSTALL.md
@@ -1,7 +1,7 @@
 Introduction
 ============
 
-All installation methods assume you already have a Python 3.9 or more recent on your system.
+All installation methods assume you already have a Python 3.10 or more recent on your system.
 
 Note that if you have all the requirements pre-installed on your system, it is not necessary to use the setup.py script
 to use Wapiti : just extract the archive and launch the "wapiti" command line in the "bin" folder :

diff --git a/Pipfile b/Pipfile
@@ -25,7 +25,7 @@ humanize = "==4.4.0"
 loguru = ">=0.5.3"
 mako = ">=1.1.4"
 markupsafe = "==2.1.1"
-mitmproxy = "==9.0.0"
+mitmproxy = ">=10.1.1"
 pyasn1 = "==0.4.8"
 pydantic = "==1.10.2"
 pytest = ">=5.4.1"
@@ -37,4 +37,4 @@ typing-extensions = "==4.4.0"
 yaswfp = ">=0.9.3"
 
 [requires]
-python_version = "3.9"
+python_version = "3.10"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.rst b/README.rst
@@ -23,7 +23,7 @@ http://wapiti-scanner.github.io/
 
 Requirements
 ============
-In order to work correctly, Wapiti needs Python 3.x where x is >= 9 (3.9, 3.10)
+In order to work correctly, Wapiti needs Python 3.x where x is >= 10 (3.10, 3.11)
 
 All Python module dependencies will be installed automatically if you use the setup.py script or `pip install wapiti3`
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,7 @@ dependencies = [
         "loguru>=0.5.3",
         "mako>=1.1.4",
         "markupsafe==2.1.1",
-        "mitmproxy==9.0.0",
+        "mitmproxy>=10.1.1",
         "pyasn1==0.4.8",
         "six>=1.15.0",
         "sqlalchemy>=1.4.26",

diff --git a/tests/integration/wapiti/Dockerfile.integration b/tests/integration/wapiti/Dockerfile.integration
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim as build
+FROM debian:bookworm-slim as build
 
 ENV DEBIAN_FRONTEND=noninteractive \
   LANG=en_US.UTF-8
@@ -15,9 +15,9 @@ RUN apt-get -y update &&\
 
 COPY . .
 
-RUN pip3 install . requests
+RUN pip3 install . requests --break-system-packages
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 ENV DEBIAN_FRONTEND=noninteractive \
   LANG=en_US.UTF-8 \
@@ -31,7 +31,7 @@ RUN apt-get -y update &&\
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* &&\
   truncate -s 0 /var/log/*log
 
-COPY --from=build /usr/local/lib/python3.9/dist-packages/ /usr/local/lib/python3.9/dist-packages/
+COPY --from=build /usr/local/lib/python3.11/dist-packages/ /usr/local/lib/python3.11/dist-packages/
 COPY --from=build /usr/local/bin/wapiti /usr/local/bin/wapiti-getcookie /usr/local/bin/
 
 COPY ./tests/integration/wapiti/test.py /usr/local/bin/test.py