From d0f1b01c5e33a04d5b447cca169d8314c709592d Mon Sep 17 00:00:00 2001 From: Tamas Nepusz Date: Mon, 10 Jul 2023 14:59:30 +0200 Subject: [PATCH] style: fixed line endings at EOF and ran the code through black --- .gitignore | 2 +- assets/icons/README.md | 1 - assets/icons/win/icon.rc | 1 - doc/antora.yml | 1 - doc/modules/ROOT/pages/index.adoc | 1 - doc/modules/ROOT/pages/panels/formations.adoc | 2 +- doc/modules/ROOT/pages/panels/formations/formations.adoc | 2 -- doc/modules/ROOT/pages/panels/leds.adoc | 2 -- etc/scripts/_build_macos_dmg.sh | 1 - etc/scripts/bootstrap.sh | 1 - etc/scripts/bootstrap_windows.bat | 1 - etc/scripts/create_blender_dist.sh | 1 - poetry.toml | 1 - pyproject.toml | 1 - src/modules/sbstudio/math/nearest_neighbors.py | 4 ++-- tbump.toml | 1 - 16 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 88017cc4..087f9344 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ doc/*.pdf tmp/ modules/skybrush -modules/pyledctrl \ No newline at end of file +modules/pyledctrl diff --git a/assets/icons/README.md b/assets/icons/README.md index 1ce589fa..3e1c4d63 100644 --- a/assets/icons/README.md +++ b/assets/icons/README.md @@ -22,4 +22,3 @@ for Windows: https://icoconvert.com/ Favicon was generated with https://favicon.io - diff --git a/assets/icons/win/icon.rc b/assets/icons/win/icon.rc index acf07d76..998427a1 100644 --- a/assets/icons/win/icon.rc +++ b/assets/icons/win/icon.rc @@ -1,2 +1 @@ IDI_ICON1 ICON DISCARDABLE "skybrush.ico" - diff --git a/doc/antora.yml b/doc/antora.yml index cfbec3bd..b4392ed5 100644 --- a/doc/antora.yml +++ b/doc/antora.yml @@ -3,4 +3,3 @@ title: Skybrush Studio for Blender version: latest nav: - modules/ROOT/nav.adoc - diff --git a/doc/modules/ROOT/pages/index.adoc b/doc/modules/ROOT/pages/index.adoc index 67a33d6e..1a27b6f6 100644 --- a/doc/modules/ROOT/pages/index.adoc +++ b/doc/modules/ROOT/pages/index.adoc @@ -8,4 +8,3 @@ image::skybrush_studio_for_blender_small.jpg[Skybrush Studio for Blender] To get a quick overview of the drone show design process with *Skybrush Studio for Blender*, we recommend to familiarize yourself with the xref:concepts.adoc[basic concepts] first, and then read the tutorial titled xref:tutorials/easy-drone-show-design.adoc[Quick guide to drone show design with Skybrush Studio]. To get a comprehensive understanding of all features and tools, please use the left sidebar for browsing the full documentation. We also encourage you to mailto:support@collmot.com[contact us] in case of any questions. - diff --git a/doc/modules/ROOT/pages/panels/formations.adoc b/doc/modules/ROOT/pages/panels/formations.adoc index 82056181..59fe488d 100644 --- a/doc/modules/ROOT/pages/panels/formations.adoc +++ b/doc/modules/ROOT/pages/panels/formations.adoc @@ -10,4 +10,4 @@ The Formations tab contains three panels: * xref:panels/formations/swarm.adoc[Swarm panel] * xref:panels/formations/formations.adoc[Formations panel] -* xref:panels/formations/storyboard.adoc[Storyboard panel] \ No newline at end of file +* xref:panels/formations/storyboard.adoc[Storyboard panel] diff --git a/doc/modules/ROOT/pages/panels/formations/formations.adoc b/doc/modules/ROOT/pages/panels/formations/formations.adoc index 2af56d8b..606d241a 100644 --- a/doc/modules/ROOT/pages/panels/formations/formations.adoc +++ b/doc/modules/ROOT/pages/panels/formations/formations.adoc @@ -93,5 +93,3 @@ image::panels/formations/formation_stats.jpg[Formation stats] == Appending a formation to the storyboard Press the btn:[Append to Storyboard] button to append the selected formation to the end of the storyboard. *Skybrush Studio* will calculate the time needed to move from the end of the last formation to the newly added formation, according to the current acceleration and velocity limits, and set up the start time of the new formation accordingly. - - diff --git a/doc/modules/ROOT/pages/panels/leds.adoc b/doc/modules/ROOT/pages/panels/leds.adoc index fe9f3d8a..d8fa7b8c 100644 --- a/doc/modules/ROOT/pages/panels/leds.adoc +++ b/doc/modules/ROOT/pages/panels/leds.adoc @@ -10,5 +10,3 @@ The LEDs tab contains two panels: * xref:panels/leds/led_control.adoc[LED Control panel] * xref:panels/leds/light_effects.adoc[Light Effects panel] - - diff --git a/etc/scripts/_build_macos_dmg.sh b/etc/scripts/_build_macos_dmg.sh index 2acbddcc..3d210c84 100755 --- a/etc/scripts/_build_macos_dmg.sh +++ b/etc/scripts/_build_macos_dmg.sh @@ -60,4 +60,3 @@ hdiutil create \ -ov \ -format UDZO \ "${OUTPUT_DIR}/${NAME} ${VERSION}.dmg" - diff --git a/etc/scripts/bootstrap.sh b/etc/scripts/bootstrap.sh index 8ec80a2a..b8fb2f1f 100755 --- a/etc/scripts/bootstrap.sh +++ b/etc/scripts/bootstrap.sh @@ -30,4 +30,3 @@ for dependency in natsort pyledctrl skybrush svgpathtools svgwrite webcolors; do ln -s "${VENV_PYTHONPATH}/${dependency}" fi done - diff --git a/etc/scripts/bootstrap_windows.bat b/etc/scripts/bootstrap_windows.bat index 4c6d91e0..38e46842 100644 --- a/etc/scripts/bootstrap_windows.bat +++ b/etc/scripts/bootstrap_windows.bat @@ -26,4 +26,3 @@ mklink /D dev\vendor\skybrush\skybrush %SKYBRUSH_ROOT%\src\skybrush FOR %%A in (jsonref.py proxytypes.py) DO mklink dev\vendor\skybrush\%%A %VENV_PYTHONPATH%\%%A cd etc/scripts - diff --git a/etc/scripts/create_blender_dist.sh b/etc/scripts/create_blender_dist.sh index a4659a55..ed40406d 100755 --- a/etc/scripts/create_blender_dist.sh +++ b/etc/scripts/create_blender_dist.sh @@ -150,4 +150,3 @@ if [ "x${BOOTLOADER_DIR}" != x ]; then echo "Single-file Windows executable created successfully in ${OUTPUT_DIR}/${ZIP_STEM}-win64.exe" echo "macOS launcher created successfully in ${OUTPUT_DIR}" fi - diff --git a/poetry.toml b/poetry.toml index 2c2faf17..ab1033bd 100644 --- a/poetry.toml +++ b/poetry.toml @@ -1,3 +1,2 @@ [virtualenvs] in-project = true - diff --git a/pyproject.toml b/pyproject.toml index 2f5764ab..31ecbddf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,4 +43,3 @@ select = ["B", "C", "E", "F", "W"] [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" - diff --git a/src/modules/sbstudio/math/nearest_neighbors.py b/src/modules/sbstudio/math/nearest_neighbors.py index ba99389e..63d4cdc7 100644 --- a/src/modules/sbstudio/math/nearest_neighbors.py +++ b/src/modules/sbstudio/math/nearest_neighbors.py @@ -55,7 +55,7 @@ def _nearest_neighbors_divide_and_conquer(points): principal_axis = points.ptp(axis=0).argmax() points = points[points[:, principal_axis].argsort(), :] p, q, dist_sq = _nearest_neighbors_divide_and_conquer_step(points, principal_axis) - return p, q, dist_sq ** 0.5 + return p, q, dist_sq**0.5 def _nearest_neighbors_divide_and_conquer_step(points, principal_axis): @@ -91,7 +91,7 @@ def _nearest_neighbors_divide_and_conquer_step(points, principal_axis): # Look for any potential improvements _between_ the two halves p3, q3, dist_sq_split = _nearest_neighbors_find_closest_split_pair( - points, principal_axis, mid_index, midpoint, dist_sq_nonsplit ** 0.5 + points, principal_axis, mid_index, midpoint, dist_sq_nonsplit**0.5 ) if dist_sq_nonsplit <= dist_sq_split: return closest_nonsplit_solution diff --git a/tbump.toml b/tbump.toml index 98b34073..7a957ca1 100644 --- a/tbump.toml +++ b/tbump.toml @@ -20,4 +20,3 @@ search = 'version = "{current_version}"' src = "src/addons/ui_skybrush_studio.py" version_template = "({major}, {minor}, {patch})" search = '"version": {current_version}' -