Merge pull request #239 from maxnus/pr-pys2clientprotocol

Migrating from s2clientprotocol to pys2clientprotocol

Author: BurnySc2

pyproject.toml

@@ -35,8 +35,7 @@ dependencies = [
     "numpy>=2.1.0; python_full_version >= '3.13'",
     "numpy>=2.0.0; python_full_version < '3.13'",
     "portpicker>=1.6.0",
-    "protobuf<4.0.0",
-    "s2clientprotocol>=5.0.14.93333.0",
+    "pys2clientprotocol>=1.0.2",
     "scipy>=1.16.3; python_full_version >= '3.14'",
     "scipy>=1.14.1; python_full_version >= '3.13'",
     "scipy>=1.7.1; python_full_version < '3.13'",
@@ -51,6 +50,7 @@ dev = [
     "pillow>=12.0.0; python_full_version >= '3.14'",
     "pillow>=11.0.0; python_full_version < '3.14'",
     "pre-commit>=4.0.1",
+    "protobuf>=6,<8",
     "pyglet>=2.0.20",
     "pylint>=3.3.2",
     # Type checker

test/test_pickled_data.py

@@ -14,7 +14,6 @@
 import math
 import pickle
 import random
-import sys
 import unittest
 from contextlib import suppress
 from pathlib import Path
@@ -72,10 +71,8 @@ def get_map_specific_bot(map_path: Path) -> BotAI:
 
 
 def test_protobuf_implementation():
-    """Make sure that cpp is used as implementation"""
-    # Doesn't seem to be implemented in newer python versions
-    if sys.version_info < (3, 10) and sys.platform != "darwin":
-        assert api_implementation.Type() == "cpp"
+    """Make sure that upb is used as implementation"""
+    assert api_implementation.Type() == "upb"
 
 
 def test_bot_ai():