diff --git a/game/missiongenerator/aircraft/waypoints/waypointgenerator.py b/game/missiongenerator/aircraft/waypoints/waypointgenerator.py index 517d1049..86ed3944 100644 --- a/game/missiongenerator/aircraft/waypoints/waypointgenerator.py +++ b/game/missiongenerator/aircraft/waypoints/waypointgenerator.py @@ -1,5 +1,6 @@ import itertools import random +from collections.abc import Iterator from datetime import datetime, timedelta from typing import Any @@ -151,7 +152,7 @@ class WaypointGenerator: min_fuel: float = consumption.min_safe # The flight plan (in reverse) up to and including the arrival point. - main_flight_plan = reversed(waypoints) + main_flight_plan: Iterator[FlightWaypoint] = reversed(waypoints) try: while waypoint := next(main_flight_plan): if waypoint.waypoint_type is FlightWaypointType.LANDING_POINT: diff --git a/requirements.txt b/requirements.txt index feb60318..50f392fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,47 +1,55 @@ -altgraph==0.17 +altgraph==0.17.2 appdirs==1.4.4 +atomicwrites==1.4.0 attrs==21.2.0 -black==21.4b0 -certifi==2020.12.5 -cfgv==3.2.0 -click==7.1.2 -distlib==0.3.1 -Faker==8.2.1 -filelock==3.0.12 +backports.entry-points-selectable==1.1.1 +black==21.11b1 +certifi==2021.10.8 +cfgv==3.3.1 +click==8.0.3 +colorama==0.4.4 +distlib==0.3.3 +Faker==9.8.2 +filelock==3.4.0 future==0.18.2 -identify==1.5.13 +identify==2.4.0 iniconfig==1.1.1 -Jinja2==2.11.3 -macholib==1.14 -MarkupSafe==1.1.1 -mypy==0.812 +Jinja2==3.0.3 +macholib==1.15.2 +MarkupSafe==2.0.1 +mypy==0.910 mypy-extensions==0.4.3 -nodeenv==1.5.0 -packaging==20.9 -pathspec==0.8.1 -pefile==2019.4.18 -Pillow==8.3.2 -pluggy==0.13.1 -pre-commit==2.10.1 -py==1.10.0 --e git://github.com/pydcs/dcs@6608b2ac083ed4ab127b56ec1490fe05070e04ae#egg=pydcs -pyinstaller==4.3 -pyinstaller-hooks-contrib==2021.1 -pyparsing==2.4.7 -pyproj==3.0.1 +nodeenv==1.6.0 +packaging==21.3 +pathspec==0.9.0 +pefile==2021.9.3 +Pillow==8.4.0 +platformdirs==2.4.0 +pluggy==1.0.0 +pre-commit==2.15.0 +py==1.11.0 +-e git+git://github.com/pydcs/dcs@6608b2ac083ed4ab127b56ec1490fe05070e04ae#egg=pydcs +pyinstaller==4.7 +pyinstaller-hooks-contrib==2021.3 +pyparsing==3.0.6 +pyproj==3.3.0 PySide2==5.15.2 -pytest==6.2.4 -python-dateutil==2.8.1 +pytest==6.2.5 +python-dateutil==2.8.2 pywin32-ctypes==0.2.0 -PyYAML==5.4.1 -regex==2020.11.13 -Shapely==1.7.1 +PyYAML==6.0 +regex==2021.11.10 +Shapely==1.8.0 shiboken2==5.15.2 -six==1.15.0 -tabulate==0.8.7 +six==1.16.0 +tabulate==0.8.9 text-unidecode==1.3 toml==0.10.2 -typed-ast==1.4.2 -types-Pillow==8.3.1 -typing-extensions==3.7.4.3 -virtualenv==20.4.2 +tomli==1.2.2 +typed-ast==1.5.0 +types-certifi==2021.10.8.0 +types-Pillow==8.3.7 +types-PyYAML==6.0.1 +types-tabulate==0.8.3 +typing_extensions==4.0.0 +virtualenv==20.10.0