Merge branch 'agent' into codex/migrate-c2client-to-pyqt6

maxDcb · web-flow · commit 8fde8ff6de81 · 2025-09-02T16:14:15.000+02:00
diff --git a/C2Client/pyproject.toml b/C2Client/pyproject.toml
@@ -8,17 +8,23 @@ version = "0.1.0"
 dependencies = [
     "setuptools",
     "pycryptodome==3.23.0",
-    "grpcio==1.66.1",
-    "PyQt6==6.7.0",
+    "grpcio==1.74.0",
+    "PyQt5==5.15.11",
     "pyqtdarktheme==2.1.0",
-    "protobuf==5.27.0",
+    "protobuf==6.32.0",
     "gitpython==3.1.45",
     "requests==2.32.5",
     "pwn==1.0",
     "pefile==2024.8.26",
     "openai==1.102.0"
 ]
 
+[project.optional-dependencies]
+test = [
+    "pytest==8.4.1",
+    "pytest-qt==4.5.0"
+]
+
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["C2Client*", "C2Client.libGrpcMessages*", "C2Client.TerminalModules.*"]
diff --git a/C2Client/requirements.txt b/C2Client/requirements.txt
@@ -8,3 +8,5 @@ requests==2.32.5
 pwn==1.0
 pefile==2024.8.26
 openai==1.102.0
+pytest==8.4.1
+pytest-qt==4.5.0
diff --git a/C2Client/tests/conftest.py b/C2Client/tests/conftest.py
@@ -0,0 +1,3 @@
+import os
+
+os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import os`
	`2`	`+`
	`3`	`+os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")`