Merge pull request #235 from BurnySc2/fix-pyrefly-errors

Fix pyrefly type checker issues

Author: BurnySc2

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
           uv run pre-commit install
 
       - name: Run pre-commit hooks
-        run: uv run pre-commit run --all-files --hook-stage push
+        run: uv run pre-commit run --all-files --hook-stage pre-push
 
   generate_dicts_from_data_json:
     name: Generate dicts from data.json
@@ -80,7 +80,7 @@ jobs:
         run: |
           mv sc2/dicts sc2/dicts_old
           uv run python generate_dicts_from_data_json.py
-          uv run pre-commit run --all-files --hook-stage push || true
+          uv run pre-commit run --all-files --hook-stage pre-push || true
           rm -rf sc2/dicts/__pycache__ sc2/dicts_old/__pycache__
 
       - name: Upload generated dicts folder as artifact

.github/workflows/docker-ci.yml

@@ -163,7 +163,6 @@ jobs:
           docker cp pyproject.toml test_container:/root/python-sc2/
           docker cp uv.lock test_container:/root/python-sc2/
           docker cp sc2 test_container:/root/python-sc2/sc2
-          docker cp s2clientprotocol test_container:/root/python-sc2/s2clientprotocol
           docker cp test test_container:/root/python-sc2/test
           docker cp examples test_container:/root/python-sc2/examples
           docker exec -i test_container bash -c "pip install uv \

.pre-commit-config.yaml

@@ -38,22 +38,25 @@ repos:
   # Autoformat code
   - id: ruff-format-check
     name: Check if files are formatted
-    stages: [push]
+    stages: [pre-push]
     language: system
+    # Run the following command to fix:
+    # uv run ruff format . 
     entry: uv run ruff format . --check --diff
     pass_filenames: false
 
   - id: ruff-lint
     name: Lint files
-    stages: [push]
+    stages: [pre-push]
     language: system
+    # Run the following command to fix:
+    # uv run ruff check . --fix
     entry: uv run ruff check .
     pass_filenames: false
 
-  # TODO Fix issues
-  # - id: pyrefly
-  #   name: Static types checking with pyrefly
-  #   stages: [push]
-  #   language: system
-  #   entry: uv run pyrefly check
-  #   pass_filenames: false
+  - id: pyrefly
+    name: Static types checking with pyrefly
+    stages: [pre-push]
+    language: system
+    entry: uv run pyrefly check
+    pass_filenames: false

.pyre_configuration

@@ -186,5 +186,5 @@ Git commit messages use [imperative-style messages](https://stackoverflow.com/a/
 To run pre-commit hooks (which run autoformatting and autosort imports) you can run
 ```sh
 uv run pre-commit install
-uv run pre-commit run --all-files --hook-stage push
+uv run pre-commit run --all-files --hook-stage pre-push
 ```

README.md

@@ -35,13 +35,12 @@ docker cp uv.lock test_container:/root/python-sc2/
 docker exec -i test_container bash -c "pip install uv && cd python-sc2 && uv sync --no-cache --no-install-project"
 
 docker cp sc2 test_container:/root/python-sc2/sc2
-docker cp s2clientprotocol test_container:/root/python-sc2/s2clientprotocol
 docker cp test test_container:/root/python-sc2/test
 
 # Run various test bots
 docker exec -i test_container bash -c "cd python-sc2 && uv run python test/travis_test_script.py test/autotest_bot.py"
 docker exec -i test_container bash -c "cd python-sc2 && uv run python test/travis_test_script.py test/queries_test_bot.py"
-#docker exec -i test_container bash -c "cd python-sc2 && uv run python test/travis_test_script.py test/damagetest_bot.py"
+docker exec -i test_container bash -c "cd python-sc2 && uv run python test/travis_test_script.py test/damagetest_bot.py"
 
 docker cp examples test_container:/root/python-sc2/examples
 docker exec -i test_container bash -c "cd python-sc2 && uv run python test/run_example_bots_vs_computer.py"

dockerfiles/test_docker_image.sh

@@ -36,7 +36,6 @@ docker cp uv.lock test_container:/root/python-sc2/
 docker exec -i test_container bash -c "pip install uv && cd python-sc2 && uv sync --no-cache --no-install-project"
 
 docker cp sc2 test_container:/root/python-sc2/sc2
-docker cp s2clientprotocol test_container:/root/python-sc2/s2clientprotocol
 docker cp test test_container:/root/python-sc2/test
 
 # Run various test bots

dockerfiles/test_new_python_candidate.sh

@@ -101,7 +101,6 @@ def position_around_unit(
         step_size: int = 1,
         exclude_out_of_bounds: bool = True,
     ):
-        # pyre-ignore[16]
         pos = pos.position.rounded
         positions = {
             pos.offset(Point2((x, y)))
@@ -114,7 +113,6 @@ def position_around_unit(
             positions = {
                 p
                 for p in positions
-                # pyre-ignore[16]
                 if 0 <= p[0] < self.game_info.pathing_grid.width and 0 <= p[1] < self.game_info.pathing_grid.height
             }
         return positions

examples/arcade_bot.py

@@ -15,7 +15,7 @@
 
 
 def main_old():
-    result: list[Result] = run_game(
+    result: Result | list[Result | None] = run_game(
         maps.get("AcropolisLE"),
         [
             Bot(Race.Protoss, WarpGateBot()),

examples/bot_vs_bot.py

@@ -4,8 +4,9 @@
 import aiohttp
 from loguru import logger
 
-import sc2
 from sc2.client import Client
+from sc2.main import _play_game
+from sc2.portconfig import Portconfig
 from sc2.protocol import ConnectionAlreadyClosedError
 
 
@@ -41,7 +42,7 @@ def run_ladder_game(bot):
     else:
         ports = [lan_port + p for p in range(1, 6)]
 
-        portconfig = sc2.portconfig.Portconfig()
+        portconfig = Portconfig()
         portconfig.server = [ports[1], ports[2]]
         portconfig.players = [[ports[3], ports[4]]]
 
@@ -56,10 +57,11 @@ def run_ladder_game(bot):
 # Modified version of sc2.main._join_game to allow custom host and port, and to not spawn an additional sc2process (thanks to alkurbatov for fix)
 async def join_ladder_game(host, port, players, realtime, portconfig, save_replay_as=None, game_time_limit=None):
     ws_url = f"ws://{host}:{port}/sc2api"
+    # pyrefly: ignore
     ws_connection = await aiohttp.ClientSession().ws_connect(ws_url, timeout=120)
     client = Client(ws_connection)
     try:
-        result = await sc2.main._play_game(players[0], client, realtime, portconfig, game_time_limit)
+        result = await _play_game(players[0], client, realtime, portconfig, game_time_limit)
         if save_replay_as is not None:
             await client.save_replay(save_replay_as)
         # await client.leave()
@@ -68,6 +70,6 @@ async def join_ladder_game(host, port, players, realtime, portconfig, save_repla
         logger.error("Connection was closed before the game ended")
         return None
     finally:
-        ws_connection.close()
+        await ws_connection.close()
 
     return result