diff --git a/.github/workflows/python-actions.yml b/.github/workflows/python-actions.yml index 364b4982..5be4d220 100644 --- a/.github/workflows/python-actions.yml +++ b/.github/workflows/python-actions.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.9] + python-version: [3.11] steps: - uses: actions/checkout@v2 @@ -58,7 +58,7 @@ jobs: strategy: fail-fast: true # one failure is enough matrix: - python-version: [3.9] + python-version: [3.11] player1: [bio, bc, 4gate, lurker, mutalisk, saferaven, disruptor] player2: [ai.zerg.hard.macro] diff --git a/requirements.dev.txt b/requirements.dev.txt index 4514f9f6..12e90710 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,6 +1,6 @@ -pytest==5.4.1 -pytest-asyncio==0.11.0 -pytest-pythonpath==0.7.3 +pytest==7.2.1 +pytest-asyncio==0.20.3 +pytest-pythonpath==0.7.4 flake8==3.7.9 black==19.10b0 pre-commit==2.2.0 diff --git a/requirements.txt b/requirements.txt index dcbf138c..6586c816 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ s2clientprotocol==4.10.3.76114.0 portpicker==1.4.0 -numpy==1.20.0 +numpy==1.24.1 requests==2.23.0 aiohttp==3.7.4 -scipy==1.7.1 +scipy==1.10.0 six==1.16.0 -opencv-python==4.5.3.56 +opencv-python==4.7.0.68 more-itertools==7.2.0 mpyq==0.2.5 -scikit-learn==0.24.2 +scikit-learn==1.2.0 loguru==0.6.0 protobuf==3.20.2 diff --git a/sc2pathlib/sc2pathlib.cp311-win_amd64.pyd b/sc2pathlib/sc2pathlib.cp311-win_amd64.pyd new file mode 100644 index 00000000..79f1f576 Binary files /dev/null and b/sc2pathlib/sc2pathlib.cp311-win_amd64.pyd differ diff --git a/sc2pathlib/sc2pathlib.cpython-311-darwin.so b/sc2pathlib/sc2pathlib.cpython-311-darwin.so new file mode 100644 index 00000000..19879056 Binary files /dev/null and b/sc2pathlib/sc2pathlib.cpython-311-darwin.so differ diff --git a/sc2pathlib/sc2pathlib.cpython-311-x86_64-linux-gnu.so b/sc2pathlib/sc2pathlib.cpython-311-x86_64-linux-gnu.so new file mode 100644 index 00000000..d6d35d5d Binary files /dev/null and b/sc2pathlib/sc2pathlib.cpython-311-x86_64-linux-gnu.so differ diff --git a/sharpy/combat/micro_rules.py b/sharpy/combat/micro_rules.py index 4c978a68..e97a9eee 100644 --- a/sharpy/combat/micro_rules.py +++ b/sharpy/combat/micro_rules.py @@ -112,5 +112,4 @@ def load_default_micro(self): self.unit_micros[UnitTypeId.REAPER] = MicroReaper() self.unit_micros[UnitTypeId.WIDOWMINE] = MicroMines() - self.generic_micro = GenericMicro() diff --git a/sharpy/combat/terran/micro_widowmines.py b/sharpy/combat/terran/micro_widowmines.py index 8e609a72..60f9474d 100644 --- a/sharpy/combat/terran/micro_widowmines.py +++ b/sharpy/combat/terran/micro_widowmines.py @@ -1,4 +1,3 @@ - from sc2.ids.ability_id import AbilityId from sc2.ids.unit_typeid import UnitTypeId from sc2.unit import Unit @@ -15,17 +14,17 @@ def __init__(self): def unit_solve_combat(self, unit: Unit, current_command: Action) -> Action: relevant_enemies = self.enemies_near_by.visible - #unburrow if retreating - if self.move_type == MoveType.PanicRetreat: + # unburrow if retreating + if self.move_type == MoveType.PanicRetreat: if unit.type_id == UnitTypeId.WIDOWMINEBURROWED and not relevant_enemies.exists: self.requested_mode = AbilityId.BURROWUP_WIDOWMINE - #getting distance to closest enemy + # getting distance to closest enemy else: if relevant_enemies.exists: self.closest_enemy = relevant_enemies.closest_distance_to(unit) else: self.closest_enemy = 100 - #toggle mode request + # toggle mode request if self.closest_enemy <= self.burrow_distance: if self.requested_mode == AbilityId.BURROWUP_WIDOWMINE: self.requested_mode = AbilityId.BURROWDOWN_WIDOWMINE @@ -34,10 +33,9 @@ def unit_solve_combat(self, unit: Unit, current_command: Action) -> Action: if self.requested_mode == AbilityId.BURROWDOWN_WIDOWMINE: self.requested_mode = AbilityId.BURROWUP_WIDOWMINE - if unit.type_id == UnitTypeId.WIDOWMINEBURROWED and self.requested_mode == AbilityId.BURROWUP_WIDOWMINE: return Action(None, False, self.requested_mode) elif unit.type_id == UnitTypeId.WIDOWMINE and self.requested_mode == AbilityId.BURROWDOWN_WIDOWMINE: - return Action(None,False, self.requested_mode) + return Action(None, False, self.requested_mode) else: return current_command diff --git a/test/Dockerfile_python-sc2 b/test/Dockerfile_python-sc2 index 65e17751..cd4b17f5 100644 --- a/test/Dockerfile_python-sc2 +++ b/test/Dockerfile_python-sc2 @@ -1,5 +1,5 @@ # Set up StarCraft II Test Environment for python-sc2 bots (not pysc2 bots!) -ARG PYTHON_VERSION=3.9 +ARG PYTHON_VERSION=3.11 # Use an official debian stretch slim release as a base image FROM python:$PYTHON_VERSION-slim