Update to the latest protos. This is needed to support more feature l…

…ayers, effect data, and observer actions.

PiperOrigin-RevId: 171136110

pysc2/bin/gen_actions.py

@@ -26,6 +26,7 @@
 
 from absl import app
 from absl import flags
+from s2clientprotocol import common_pb2 as sc_common
 from s2clientprotocol import data_pb2 as sc_data
 from s2clientprotocol import sc2api_pb2 as sc_pb
 
@@ -43,9 +44,9 @@ def get_data():
     create = sc_pb.RequestCreateGame(local_map=sc_pb.LocalMap(
         map_path=m.path, map_data=m.data(run_config)))
     create.player_setup.add(type=sc_pb.Participant)
-    create.player_setup.add(type=sc_pb.Computer, race=sc_pb.Random,
+    create.player_setup.add(type=sc_pb.Computer, race=sc_common.Random,
                             difficulty=sc_pb.VeryEasy)
-    join = sc_pb.RequestJoinGame(race=sc_pb.Random,
+    join = sc_pb.RequestJoinGame(race=sc_common.Random,
                                  options=sc_pb.InterfaceOptions(raw=True))
 
     controller.create_game(create)

pysc2/bin/replay_actions.py

@@ -39,6 +39,7 @@
 from absl import app
 from absl import flags
 from pysc2.lib import gfile
+from s2clientprotocol import common_pb2 as sc_common
 from s2clientprotocol import sc2api_pb2 as sc_pb
 
 FLAGS = flags.FLAGS
@@ -204,8 +205,9 @@ def run(self):
               if valid_replay(info, ping):
                 self.stats.replay_stats.maps[info.map_name] += 1
                 for player_info in info.player_info:
-                  self.stats.replay_stats.races[
-                      sc_pb.Race.Name(player_info.player_info.race_actual)] += 1
+                  race_name = sc_common.Race.Name(
+                      player_info.player_info.race_actual)
+                  self.stats.replay_stats.races[race_name] += 1
                 map_data = None
                 if info.local_map_path:
                   self._update_stage("open map file")

pysc2/bin/replay_info.py

@@ -26,6 +26,7 @@
 
 from absl import app
 from pysc2.lib import gfile
+from s2clientprotocol import common_pb2 as sc_common
 from s2clientprotocol import sc2api_pb2 as sc_pb
 
 
@@ -65,12 +66,12 @@ def _replay_index(replay_dir):
             info.game_duration_loops,
             len(info.player_info),
             sc_pb.Result.Name(info.player_info[0].player_result.result),
-            sc_pb.Race.Name(info.player_info[0].player_info.race_actual),
+            sc_common.Race.Name(info.player_info[0].player_info.race_actual),
             info.player_info[0].player_apm,
         ]
         if len(info.player_info) >= 2:
           out += [
-              sc_pb.Race.Name(info.player_info[1].player_info.race_actual),
+              sc_common.Race.Name(info.player_info[1].player_info.race_actual),
               info.player_info[1].player_apm,
           ]
         print(u",".join(str(s) for s in out))

pysc2/env/sc2_env.py

@@ -28,6 +28,7 @@
 from pysc2.lib import run_parallel
 from pysc2.lib import stopwatch
 
+from s2clientprotocol import common_pb2 as sc_common
 from s2clientprotocol import sc2api_pb2 as sc_pb
 
 sw = stopwatch.sw
@@ -41,10 +42,10 @@
 }
 
 races = {
-    "R": sc_pb.Random,
-    "P": sc_pb.Protoss,
-    "T": sc_pb.Terran,
-    "Z": sc_pb.Zerg,
+    "R": sc_common.Random,
+    "P": sc_common.Protoss,
+    "T": sc_common.Terran,
+    "Z": sc_common.Zerg,
 }
 
 difficulties = {

pysc2/tests/maps_test.py

@@ -29,6 +29,7 @@
 from pysc2.tests import utils
 
 from absl.testing import absltest as basetest
+from s2clientprotocol import common_pb2 as sc_common
 from s2clientprotocol import sc2api_pb2 as sc_pb
 
 
@@ -58,9 +59,9 @@ def test_load_random_map(self):
         create = sc_pb.RequestCreateGame(local_map=sc_pb.LocalMap(
             map_path=m.path, map_data=m.data(run_config)))
         create.player_setup.add(type=sc_pb.Participant)
-        create.player_setup.add(type=sc_pb.Computer, race=sc_pb.Random,
+        create.player_setup.add(type=sc_pb.Computer, race=sc_common.Random,
                                 difficulty=sc_pb.VeryEasy)
-        join = sc_pb.RequestJoinGame(race=sc_pb.Random,
+        join = sc_pb.RequestJoinGame(race=sc_common.Random,
                                      options=sc_pb.InterfaceOptions(raw=True))
 
         controller.create_game(create)

pysc2/tests/replay_obs_test.py

@@ -33,6 +33,7 @@
 from pysc2.tests import utils
 
 from absl.testing import absltest as basetest
+from s2clientprotocol import common_pb2 as sc_common
 from s2clientprotocol import sc2api_pb2 as sc_pb
 
 # TODO(tewalds): define unit types in static data?
@@ -156,10 +157,10 @@ def create_game(self):
     create.player_setup.add(type=sc_pb.Participant)
     create.player_setup.add(
         type=sc_pb.Computer,
-        race=sc_pb.Terran,
+        race=sc_common.Terran,
         difficulty=sc_pb.VeryEasy)
     join = sc_pb.RequestJoinGame(
-        race=sc_pb.Terran,
+        race=sc_common.Terran,
         options=self._config.interface)
 
     self._controller.create_game(create)

setup.py

@@ -67,7 +67,7 @@
         'portpicker',
         'protobuf>=2.6',
         'pygame',
-        's2clientprotocol==1.1',
+        's2clientprotocol>=1.2',
         'six',
         'websocket-client',
     ],