diff --git a/README.md b/README.md index 57ee2072c..4844e9269 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![image](https://img.shields.io/badge/pypi-v3.1.2-blue.svg)](https://pypi.org/project/dcspy/) +[![image](https://img.shields.io/badge/pypi-v3.1.3-blue.svg)](https://pypi.org/project/dcspy/) [![Python CI](https://github.com/emcek/dcspy/actions/workflows/python-ci.yml/badge.svg?branch=master)](https://github.com/emcek/dcspy/actions/workflows/python-ci.yml) [![Coverage Status](https://coveralls.io/repos/github/emcek/dcspy/badge.svg?branch=master)](https://coveralls.io/github/emcek/dcspy?branch=master) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/5270a4fc2ba24261a3bfa7361150e8ff)](https://app.codacy.com/gh/emcek/dcspy/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) diff --git a/dcspy.spec b/dcspy.spec index 6abf3333a..b7edc40c9 100644 --- a/dcspy.spec +++ b/dcspy.spec @@ -5,7 +5,7 @@ files = [(f'dcspy/{res}', 'dcspy') for res in ['AH-64D_BLK_II.yaml', 'AV8BNA.ya images = [(f'dcspy/img/{res}', 'dcspy/img') for res in ['splash.png', 'dcspy_white.ico', 'dcspy_black.ico']] resources = [(f'dcspy/resources/{res}', 'dcspy/resources') for res in ['falconded.ttf', 'license.txt']] headers = [(f'dcspy/sdk/{head}', 'dcspy/sdk') for head in ['LogitechLCDLib.h', 'LogitechLEDLib.h', 'LogitechGkeyLib.h']] -__version__ = '3.1.2' +__version__ = '3.1.3' block_cipher = None diff --git a/dcspy/__init__.py b/dcspy/__init__.py index 811dba617..4bf5bcd0c 100644 --- a/dcspy/__init__.py +++ b/dcspy/__init__.py @@ -11,7 +11,7 @@ from dcspy.utils import check_dcs_ver, get_default_yaml, load_yaml, save_yaml LOG = getLogger(__name__) -__version__ = '3.1.2' +__version__ = '3.1.3' default_yaml = get_default_yaml(local_appdata=LOCAL_APPDATA) _start_cfg = load_yaml(full_path=default_yaml) diff --git a/dcspy/config.yaml b/dcspy/config.yaml index 8678a6f90..b8df03368 100644 --- a/dcspy/config.yaml +++ b/dcspy/config.yaml @@ -1,4 +1,4 @@ -api_ver: 3.1.2 +api_ver: 3.1.3 autostart: false check_bios: true check_ver: true diff --git a/dcspy/migration.py b/dcspy/migration.py index 2d648cf28..206d9d290 100644 --- a/dcspy/migration.py +++ b/dcspy/migration.py @@ -11,7 +11,7 @@ from dcspy.utils import DEFAULT_YAML_FILE, defaults_cfg, get_config_yaml_location LOG = getLogger(__name__) -__version__ = '3.1.2' +__version__ = '3.1.3' def migrate(cfg: DcspyConfigYaml) -> DcspyConfigYaml: diff --git a/dcspy/qt_gui.py b/dcspy/qt_gui.py index 798024717..18f7855d5 100644 --- a/dcspy/qt_gui.py +++ b/dcspy/qt_gui.py @@ -35,7 +35,7 @@ save_yaml) _ = qtgui_rc # prevent to remove import statement accidentally -__version__ = '3.1.2' +__version__ = '3.1.3' LOG = getLogger(__name__) NO_MSG_BOX = environ.get('DCSPY_NO_MSG_BOXES', 0) diff --git a/dcspy/run.py b/dcspy/run.py index a6465d4e7..f223ed8ed 100644 --- a/dcspy/run.py +++ b/dcspy/run.py @@ -11,7 +11,7 @@ from dcspy.qt_gui import DcsPyQtGui LOG = getLogger(__name__) -__version__ = '3.1.2' +__version__ = '3.1.3' def run() -> None: diff --git a/dcspy/starter.py b/dcspy/starter.py index a4f76d746..83ae65745 100644 --- a/dcspy/starter.py +++ b/dcspy/starter.py @@ -15,7 +15,7 @@ LOG = getLogger(__name__) LOOP_FLAG = True -__version__ = '3.1.2' +__version__ = '3.1.3' def _handle_connection(manager: KeyboardManager, parser: ProtocolParser, sock: socket.socket, ver_string: str, event: Event) -> None: diff --git a/dcspy/utils.py b/dcspy/utils.py index 7f7f2a80d..2fad599de 100644 --- a/dcspy/utils.py +++ b/dcspy/utils.py @@ -29,7 +29,7 @@ pass LOG = getLogger(__name__) -__version__ = '3.1.2' +__version__ = '3.1.3' CONFIG_YAML = 'config.yaml' DEFAULT_YAML_FILE = Path(__file__).resolve().with_name(CONFIG_YAML) diff --git a/dcspy_cli.spec b/dcspy_cli.spec index a02609ca0..d773259e3 100644 --- a/dcspy_cli.spec +++ b/dcspy_cli.spec @@ -5,7 +5,7 @@ files = [(f'dcspy/{res}', 'dcspy') for res in ['AH-64D_BLK_II.yaml', 'AV8BNA.ya images = [(f'dcspy/img/{res}', 'dcspy/img') for res in ['splash.png', 'dcspy_white.ico', 'dcspy_black.ico']] resources = [(f'dcspy/resources/{res}', 'dcspy/resources') for res in ['falconded.ttf', 'license.txt']] headers = [(f'dcspy/sdk/{head}', 'dcspy/sdk') for head in ['LogitechLCDLib.h', 'LogitechLEDLib.h', 'LogitechGkeyLib.h']] -__version__ = '3.1.2' +__version__ = '3.1.3' block_cipher = None diff --git a/dcspy_onedir.spec b/dcspy_onedir.spec index 389615c44..4e1dd9ffb 100644 --- a/dcspy_onedir.spec +++ b/dcspy_onedir.spec @@ -5,7 +5,7 @@ files = [(f'dcspy/{res}', 'dcspy') for res in ['AH-64D_BLK_II.yaml', 'AV8BNA.ya images = [(f'dcspy/img/{res}', 'dcspy/img') for res in ['splash.png', 'dcspy_white.ico', 'dcspy_black.ico']] resources = [(f'dcspy/resources/{res}', 'dcspy/resources') for res in ['falconded.ttf', 'license.txt']] headers = [(f'dcspy/sdk/{head}', 'dcspy/sdk') for head in ['LogitechLCDLib.h', 'LogitechLEDLib.h', 'LogitechGkeyLib.h']] -__version__ = '3.1.2' +__version__ = '3.1.3' block_cipher = None diff --git a/generate_ver_file.py b/generate_ver_file.py index f56c2f5a5..00a919067 100644 --- a/generate_ver_file.py +++ b/generate_ver_file.py @@ -39,7 +39,7 @@ def generate_ver_info(major: int, minor: int, patch: int, build: int, git_sha: s return ver_info -def save_ver_file(ver=environ.get('GITHUB_REF_NAME', '3.1.2'), bld=environ.get('GITHUB_RUN_NUMBER', '1'), +def save_ver_file(ver=environ.get('GITHUB_REF_NAME', '3.1.3'), bld=environ.get('GITHUB_RUN_NUMBER', '1'), sha=environ.get('GITHUB_SHA', 'deadbeef'), ver_f='file_version_info.txt') -> Sequence[str]: """ Save generated version file based on list of strings. diff --git a/tests/test_migration.py b/tests/test_migration.py index d9f7368ec..d0769eb6c 100644 --- a/tests/test_migration.py +++ b/tests/test_migration.py @@ -5,11 +5,11 @@ @mark.parametrize('cfg, result', [ ({'api_ver': '2.9.9', 'val': 1, 'font_color_s': 66, 'theme_mode': 'system'}, - {'api_ver': '3.1.2', 'completer_items': 20, 'current_plane': 'A-10C', 'font_color_m': 66, 'font_color_s': 18, 'font_mono_m': 11, 'font_mono_s': 9, 'val': 1}), + {'api_ver': '3.1.3', 'completer_items': 20, 'current_plane': 'A-10C', 'font_color_m': 66, 'font_color_s': 18, 'font_mono_m': 11, 'font_mono_s': 9, 'val': 1}), ({'api_ver': '3.0.0', 'val': 1, 'font_color_s': 66, 'theme_mode': 'system'}, - {'api_ver': '3.1.2', 'font_color_s': 66, 'theme_mode': 'system', 'val': 1}), + {'api_ver': '3.1.3', 'font_color_s': 66, 'theme_mode': 'system', 'val': 1}), ({'val': 1, 'font_color_s': 66, 'theme_mode': 'system'}, - {'api_ver': '3.1.2', 'completer_items': 20, 'current_plane': 'A-10C', 'font_color_m': 66, 'font_color_s': 18, 'font_mono_m': 11, 'font_mono_s': 9, 'val': 1}), + {'api_ver': '3.1.3', 'completer_items': 20, 'current_plane': 'A-10C', 'font_color_m': 66, 'font_color_s': 18, 'font_mono_m': 11, 'font_mono_s': 9, 'val': 1}), ], ids=['API 2.9.9', 'API 3.0.0', 'API empty']) def test_migrate(cfg, result): migrated_cfg = migrate(cfg=cfg) @@ -21,7 +21,7 @@ def test_generate_config(): migrated_cfg = migrate(cfg={}) assert migrated_cfg == { - 'api_ver': '3.1.2', + 'api_ver': '3.1.3', 'autostart': False, 'check_bios': True, 'check_ver': True, diff --git a/tests/test_utils.py b/tests/test_utils.py index 23985c74a..5aba97831 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -90,7 +90,7 @@ def test_dummy_save_load_migrate(tmpdir): assert d_cfg == {'font_mono_s': 9} d_cfg = migrate(cfg=d_cfg) assert d_cfg == { - 'api_ver': '3.1.2', + 'api_ver': '3.1.3', 'keyboard': 'G13', 'save_lcd': False, 'show_gui': True,