diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1999e23..4f7e25d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.13' cache: 'pip' - name: Install dependencies run: pip install -r requirements.txt diff --git a/docs/home/getting_involved/index.md b/docs/home/getting_involved/index.md index fd0f027..6e57c23 100644 --- a/docs/home/getting_involved/index.md +++ b/docs/home/getting_involved/index.md @@ -18,7 +18,7 @@ If you have any questions, do not hesitate to contact us **[on our Discord serve * the swift pilot client, core and mapping tool are written in C++/Qt. You can help to improve the core functionality and add new features -* A MacOS enthusiast is needed to further integrate Apple specific functionality +* A macOS enthusiast is needed to further integrate Apple specific functionality * PHP/JavaScript programmers could help to improve [swift datastore](https://datastore.swift-project.org/page/index.php) (LAMP based), the backend DB for mappings. The datastore also provides web services for swift and we plan to improve the feature in the future. * [Getting started as developer](./developer.md) diff --git a/docs/home/install/configure_xp.md b/docs/home/install/configure_xp.md index d1f4549..15efba2 100644 --- a/docs/home/install/configure_xp.md +++ b/docs/home/install/configure_xp.md @@ -194,7 +194,7 @@ It has to be installed into your **X-Plane plugins-folder** (found at ``YourDriv !!! note - in case that you do **not** have **[7zip (freeware)](https://www.7-zip.org/)** or if it isn't available for your OS at all (e.g. MacOS), *swift* will produce an error message. + in case that you do **not** have **[7zip (freeware)](https://www.7-zip.org/)** or if it isn't available for your OS at all (e.g. macOS), *swift* will produce an error message. You will then have to **install xswiftbus manually** by extracting the archive to ``X-Plane 11\Resources\plugins\`` (overwriting existing xswiftbus files there). ## Hotkey Wizard diff --git a/docs/home/install/install_mac.md b/docs/home/install/install_mac.md index c6aee5f..39eb05a 100644 --- a/docs/home/install/install_mac.md +++ b/docs/home/install/install_mac.md @@ -7,7 +7,7 @@ !!! note - use the dedicated **64bit** MacOS version of *swift* **only** + use the dedicated **64bit** macOS version of *swift* **only** !!! warning diff --git a/docs/home/models/xplane/csl2xsb_converter.md b/docs/home/models/xplane/csl2xsb_converter.md index f93d9b6..cc2b721 100644 --- a/docs/home/models/xplane/csl2xsb_converter.md +++ b/docs/home/models/xplane/csl2xsb_converter.md @@ -5,7 +5,7 @@ **CSL2XSB is a Python script** that will convert X-CSL models to a format that can be understood and rendered by the new **Vulkan/Metal graphics engine of X-Plane 11.50+**. -There's a **difference for users of Windows and MacOS/Linux**. +There's a **difference for users of Windows and macOS/Linux**. Please use the respective paragraph. ## CSL2XSB on Windows Systems @@ -66,8 +66,8 @@ You have converted those incompatible models and you have reloaded the model set You can now continue working with those models in the Mapping Tool. -## CSL2XSB on MacOS and Linux Systems -Unfortunately it was **not** possible to integrate the CSL2XSB script into the installers for MacOS and Linux. +## CSL2XSB on macOS and Linux Systems +Unfortunately it was **not** possible to integrate the CSL2XSB script into the installers for macOS and Linux. As a consequence you will have to convert the models manually and we show you here how to do it. - **Install Python 3+**: is Python 3 or newer installed on your system? diff --git a/docs/home/system_requirements.md b/docs/home/system_requirements.md index 059f17e..3cfce43 100644 --- a/docs/home/system_requirements.md +++ b/docs/home/system_requirements.md @@ -29,8 +29,8 @@ Our *swift* applications have been designed to work on all relevant operating sy * Microsoft Windows 10 or Microsoft Windows 11 * 200 MB free disk space -## MacOS - * MacOS 10.12 or higher +## macOS + * macOS 10.12 or higher * 64 bit only * 200 MB free disk space diff --git a/docs/home/updating/update_current_version.md b/docs/home/updating/update_current_version.md index 83f2909..008d8d7 100644 --- a/docs/home/updating/update_current_version.md +++ b/docs/home/updating/update_current_version.md @@ -54,7 +54,7 @@ If you do **NOT** use **X-Plane**, then you are done here and you can go flying! !!! note - In case that you do **not** have **[7zip (freeware)](https://www.7-zip.org/)** or if it isn't available for your OS at all (e.g. MacOS), *swift* will produce an error message. + In case that you do **not** have **[7zip (freeware)](https://www.7-zip.org/)** or if it isn't available for your OS at all (e.g. macOS), *swift* will produce an error message. You will then have to **install *xswiftbus* manually** by extracting the archive to ``X-Plane 11\Resources\plugins\`` (overwriting existing *xswiftbus* files there) * when done, you can either keep the archive or delete it. diff --git a/docs/home/updating/upgrade_new_version.md b/docs/home/updating/upgrade_new_version.md index 6cbec77..b9e2d54 100644 --- a/docs/home/updating/upgrade_new_version.md +++ b/docs/home/updating/upgrade_new_version.md @@ -97,7 +97,7 @@ If you do **NOT** use **X-Plane**, then you are done here and you can go flying! !!! note - In case that you do **not** have **[7zip (freeware)](https://www.7-zip.org/)** or if it isn't available for your OS at all (e.g. MacOS), *swift* will produce an error message. + In case that you do **not** have **[7zip (freeware)](https://www.7-zip.org/)** or if it isn't available for your OS at all (e.g. macOS), *swift* will produce an error message. You will then have to **install *xswiftbus* manually** by extracting the archive to ``X-Plane 11\Resources\plugins\`` (overwriting existing *xswiftbus* files there) * when done, you can either keep the archive or delete it. diff --git a/docs/index.md b/docs/index.md index c15f640..555432f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -13,7 +13,7 @@ We are an independent (private/non-commercial) software project creating open so - **supports** Windows, macOS, Linux - **compatible with** X-Plane 11 (Vulkan/Metal/OpenGL) - MSFS2020 - MSFS2024 - P3D (64-bit) - Flightgear - (FSX, FS9 and P3D (32-bit) are supported only with older versions of swift) -- *integrated **AFV - Audio For VATSIM** +- integrated **AFV - Audio For VATSIM** - **AFV voice-volume control** through hotkeys - **tuning and switching** of COM-radios, transponder, SELCAL - **radar function** to help you maintain **situational awareness** diff --git a/docs/troubleshooting/first_install.md b/docs/troubleshooting/first_install.md index c8a1dc3..b05b4d8 100644 --- a/docs/troubleshooting/first_install.md +++ b/docs/troubleshooting/first_install.md @@ -33,7 +33,7 @@ See [Why do I see validation errors during startup?](./../documentation/flying/w **No Mic / cannot talk to controller** - [Troubleshoot voice (no ATC, no MIC, no sound, sample rates, WASAPI)](./voice.md) -- MacOS user? See [here](./no_sound_macos.md) +- macOS user? See [here](./no_sound_macos.md) - Windows: [Microphone not working on Windows](./no_microphone_windows.md) **The Qt WIFI problem** @@ -77,7 +77,7 @@ In your *swift* installation directory you will see a directory `bearer`, just r ![](./../img/swift_LED_bar.jpg){: style="width:70%"} - - XPlane not connecting with *swift* on MacOS, see [this page](./xp_on_macos.md). + - XPlane not connecting with *swift* on macOS, see [this page](./xp_on_macos.md). - **HINT:** Some users did have problems with spaces in their model directory paths - **Aircraft animation** as gear down **not working**: - There are some known conflicts with other XPlane add-ons as those keep common multiplayer animation `datarefs` (being shared between all pilot clients) locked and the *swift* dataref registration fails. @@ -101,5 +101,5 @@ In your *swift* installation directory you will see a directory `bearer`, just r **Some issues with Mac OS** -- XPlane not connecting with *swift* on MacOS, see [this page](./xp_on_macos.md). +- XPlane not connecting with *swift* on macOS, see [this page](./xp_on_macos.md). - Not validated: Installation in `Application` failed, but in XPlane directory it works. diff --git a/docs/troubleshooting/no_sound_macos.md b/docs/troubleshooting/no_sound_macos.md index f06b2e6..d148a2f 100644 --- a/docs/troubleshooting/no_sound_macos.md +++ b/docs/troubleshooting/no_sound_macos.md @@ -8,7 +8,7 @@ Make sure you have the MIC (microphone) enabled for *swift*. ![](./../img/macsound.jpg){: style="width:70%"} - There is a bug currently being investigated. -- MacOSX seems to be very picky about app bundle info.plist. +- macOS seems to be very picky about app bundle info.plist. No matter what we add to it, it just won't work without any warning. - Workaround: Open the swiftguistd application bundle content and drag the internal binary into console. That should work diff --git a/docs/troubleshooting/swift_log_files.md b/docs/troubleshooting/swift_log_files.md index 2f29219..fea1366 100644 --- a/docs/troubleshooting/swift_log_files.md +++ b/docs/troubleshooting/swift_log_files.md @@ -13,7 +13,7 @@ The path is something like here: - Then some magic name representing your swift version, like `H%3A%2FProjects%2FQtBuilds%2Fbuild-swift-Desktop_Qt_5_11_1_MSVC2017_64bit2-Debug%2Fout%2Fdebug%2Fbin\logs` - See also: [Find cache files](./cache_settings_location.md) -On MacOS, the Path is `\~/Library/ApplicationSupport/org.swift-project\` +On macOS, the Path is `\~/Library/ApplicationSupport/org.swift-project\` ![](./../img/FindLogsMacOS.jpg){: style="width:50%"} diff --git a/docs/troubleshooting/voice.md b/docs/troubleshooting/voice.md index 1b90aab..f172f74 100644 --- a/docs/troubleshooting/voice.md +++ b/docs/troubleshooting/voice.md @@ -12,7 +12,7 @@ - Is the PTT button defined, see [here](./../documentation/swift_gui/settings_page.md#hotkeys) - Does it work, If you press it, do you see the LED flashing? - If it is defined but does NOT work, remove it and add it again! -- on **MacOSX** [make sure mic privilege is granted](./no_sound_macos.md). +- on **macOS** [make sure mic privilege is granted](./no_sound_macos.md). - **Linux**: We read keyboard and joystick stuff from `/dev/input/event*` and `js*`. Those files have to be readable by your user. See [this page](./linux_hotkeys.md) - **Windows**: [Microphone not working on Windows](./no_microphone_windows.md) - **Is loopback working**? If not, this would mean some issue of *swift* and your hardware. diff --git a/docs/troubleshooting/xp_on_macos.md b/docs/troubleshooting/xp_on_macos.md index cffe714..a608320 100644 --- a/docs/troubleshooting/xp_on_macos.md +++ b/docs/troubleshooting/xp_on_macos.md @@ -3,7 +3,7 @@ SPDX-License-Identifier: GFDL-1.3-only --> -For some people swift only works with session bus on MacOS. +For some people swift only works with session bus on macOS. Reason: UNKNOWN, if you figure it out - let us know! diff --git a/mkdocs.yml b/mkdocs.yml index 68d3c7a..7224683 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -16,7 +16,7 @@ nav: - Download: home/install/download.md - Installation: - Windows: home/install/install_windows.md - - MacOS: home/install/install_mac.md + - macOS: home/install/install_mac.md - Linux: home/install/install_linux.md - Configuration: - X-Plane 11: home/install/configure_xp.md @@ -153,7 +153,7 @@ nav: - swift user data: documentation/flying/swift_user_data.md - Troubleshooting: - troubleshooting/index.md - - swift does not connect with XPlane on MacOS: troubleshooting/xp_on_macos.md + - swift does not connect with XPlane on macOS: troubleshooting/xp_on_macos.md - Troubleshoot installation and 1st start: troubleshooting/first_install.md - Troubleshoot voice: troubleshooting/voice.md - Linux Hotkeys are not detected: troubleshooting/linux_hotkeys.md diff --git a/requirements.txt b/requirements.txt index dc68b17..3286b5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,37 +1,39 @@ # SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors # SPDX-License-Identifier: CC0-1.0 -Babel==2.13.0 -binaryornot==0.4.4 -boolean.py==4.0 -certifi==2024.7.4 -chardet==5.2.0 -charset-normalizer==3.3.0 -click==8.1.7 +attrs==25.4.0 +babel==2.17.0 +backrefs==6.1 +boolean.py==5.0 +certifi==2025.11.12 +charset-normalizer==3.4.4 +click==8.3.1 colorama==0.4.6 ghp-import==2.1.0 -idna==3.7 +idna==3.11 Jinja2==3.1.6 -license-expression==30.1.1 -Markdown==3.5 -MarkupSafe==2.1.3 +license-expression==30.4.4 +Markdown==3.10 +MarkupSafe==3.0.3 mergedeep==1.3.4 -mkdocs==1.5.3 -mkdocs-material==9.4.6 -mkdocs-material-extensions==1.3 -packaging==23.2 -paginate==0.5.6 -pathspec==0.11.2 -platformdirs==3.11.0 -Pygments==2.16.1 -pymdown-extensions==10.3.1 -python-dateutil==2.8.2 -python-debian==0.1.49 -PyYAML==6.0.1 -pyyaml_env_tag==0.1 -regex==2023.10.3 -requests==2.32.4 -reuse==4.0.3 -six==1.16.0 -urllib3==2.6.0 -watchdog==3.0.0 +mkdocs==1.6.1 +mkdocs-get-deps==0.2.0 +mkdocs-material==9.7.1 +mkdocs-material-extensions==1.3.1 +packaging==25.0 +paginate==0.5.7 +pathspec==0.12.1 +platformdirs==4.5.1 +Pygments==2.19.2 +pymdown-extensions==10.19.1 +python-dateutil==2.9.0.post0 +python-debian==1.0.1 +python-magic==0.4.27 +PyYAML==6.0.3 +pyyaml_env_tag==1.1 +requests==2.32.5 +reuse==6.2.0 +six==1.17.0 +tomlkit==0.13.3 +urllib3==2.6.2 +watchdog==6.0.0