Update requires

requirements.txt

@@ -1,85 +1,69 @@
-aiohttp==4.0.0a1
+aiohttp==3.7.4.post0
 appdirs==1.4.4
-Arpeggio==1.9.2
-asgiref==3.3.1
-asn1crypto==1.3.0
+Arpeggio==1.10.2
+asgiref==3.3.4
 async-timeout==3.0.1
-attrs==19.3.0
-black==20.8b1
+attrs==20.3.0
+black==21.4b2
 blinker==1.4
 Brotli==1.0.9
 certifi==2020.12.5
-cffi==1.14.4
-chardet==3.0.4
+cffi==1.14.5
+chardet==4.0.0
 click==7.1.2
 cryptography==3.3.2
-defusedxml==0.6.0
-dnspython==1.16.0
-eventlet==0.25.1
+defusedxml==0.7.1
 Flask==1.1.2
 Glymur==0.9.3
-graphviz==0.16
-greenlet==0.4.17
-h11==0.11.0
+h11==0.12.0
 h2==4.0.0
 hpack==4.0.0
-hyperframe==6.0.0
-idna==2.9
-idna-ssl==1.1.0
+hyperframe==6.0.1
+idna==2.10
 itsdangerous==1.1.0
 jedi==0.18.0
 Jinja2==2.11.3
 kaitaistruct==0.9
 lazy-object-proxy==1.6.0
 ldap3==2.8.1
-llbase==1.2.5
+llbase==1.2.10
 lxml==4.6.3
 MarkupSafe==1.1.1
 mitmproxy==6.0.2
-monotonic==1.5
-more-itertools==8.3.0
 msgpack==1.0.2
-multidict==4.7.5
+multidict==5.1.0
 mypy-extensions==0.4.3
-numpy==1.19.5
-objgraph==3.4.1
-packaging==20.4
-parso==0.8.1
+numpy==1.20.2
+parso==0.8.2
 passlib==1.7.4
 pathspec==0.8.1
-pluggy==0.13.1
 prompt-toolkit==3.0.18
 protobuf==3.14.0
 ptpython==3.0.17
 publicsuffix2==2.20191221
-py==1.10.0
 pyasn1==0.4.8
 pycparser==2.20
 Pygments==2.8.1
 pyOpenSSL==20.0.1
 pyparsing==2.4.7
-pyperclip==1.8.1
+pyperclip==1.8.2
 PySide2==5.15.2
-pytest==5.4.3
-python-dateutil==2.8.1
-qasync==0.13.0
+qasync==0.15.0
 recordclass==0.14.3
-regex==2021.3.17
-requests==2.23.0
-ruamel.yaml==0.16.12
+regex==2021.4.4
+requests==2.25.1
+ruamel.yaml==0.16.13
 ruamel.yaml.clib==0.2.2
 shiboken2==5.15.2
 six==1.15.0
 sortedcontainers==2.3.0
 toml==0.10.2
 tornado==6.1
-typed-ast==1.4.2
-typing-extensions==3.7.4.1
-urllib3==1.25.8
+typing-extensions==3.7.4.3
+urllib3==1.26.4
 urwid==2.1.2
-wcwidth==0.2.3
-WebOb==1.8.6
+wcwidth==0.2.5
 Werkzeug==1.0.1
 wsproto==1.0.0
-yarl==1.4.2
+yarl==1.6.3
 zstandard==0.14.1

setup.py

@@ -68,21 +68,31 @@ setup(
         'console_scripts': [
             "hippolyzer-gui = hippolyzer.apps.proxy_gui:gui_main",
             "hippolyzer-cli = hippolyzer.apps.proxy:main",
-        ]
+        ],
     },
     zip_safe=False,
     python_requires='>=3.8',
     install_requires=[
-        'setuptools',
         'llbase>=1.2.5',
         'defusedxml',
-        'aiohttp',
+        'aiohttp<4.0.0',
         'recordclass',
         'lazy-object-proxy',
+        'arpeggio',
+        # requests breaks with newer idna
+        'idna<3,>=2.5',
         # 7.x will be a major change.
         'mitmproxy<7.0.0',
+        # For REPLs
+        'ptpython<4.0',
+        # JP2 codec
+        'Glymur<1.0',
+        'numpy<2.0',
         # These could be in extras_require if you don't want a GUI.
         'pyside2',
         'qasync',
     ],
+    tests_require=[
+        "pytest",
+    ],
 )