From c64e1410ab9722c736cc4c9af1d6e5ca30c37a2e Mon Sep 17 00:00:00 2001 From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:41:46 +0100 Subject: [PATCH 1/3] fix: upgrade all python versions used on CI to 3.13 --- .github/workflows/build.yml | 4 ++-- .github/workflows/changelog.yml | 2 +- .github/workflows/sphinx.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 988bd49baf..30a7abaecf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.7' + python-version: '3.13' - name: Install Python dependencies run: pip install --upgrade -r requirements.txt - name: Build versioned HTML manual @@ -58,7 +58,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.7' + python-version: '3.13' - name: Install Python dependencies run: pip install --upgrade -r requirements.txt - name: Set up SSH Agent diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 4e52cd21c4..0214ab68b0 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -27,7 +27,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.13 - name: Install Python dependencies run: pip install -r requirements-changelog.txt - name: Update Changelog diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml index 9b1b94e085..67daa6bce8 100644 --- a/.github/workflows/sphinx.yml +++ b/.github/workflows/sphinx.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.7' + python-version: '3.13' - name: Install Python dependencies run: | python -m pip install --upgrade pip @@ -33,7 +33,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.7' + python-version: '3.13' - name: Install Python dependencies run: | python -m pip install --upgrade pip From c536271228c2a1defa839671fc59450a41b42da7 Mon Sep 17 00:00:00 2001 From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:48:24 +0100 Subject: [PATCH 2/3] chore: pre-commit autoupdate --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f5d59e5c07..adc54b31b4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: entry: python tools/fixup_gh_wiki_anchors.py language: python - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.1.0 + rev: v5.0.0 hooks: - id: check-byte-order-marker - id: check-case-conflict @@ -26,7 +26,7 @@ repos: exclude: ^source/locale/.*$ - id: check-yaml - repo: https://github.com/codespell-project/codespell - rev: f7f304cb40596e4706be27ca44d1401396a97420 + rev: v2.3.0 hooks: - id: codespell name: "Check for spelling mistakes" @@ -37,19 +37,19 @@ repos: ] exclude: ^(.*\.svg|source/locale/.*)$ - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 24.10.0 hooks: - id: black name: "Reformat Python code" - repo: https://github.com/pycqa/flake8 - rev: '3.8.3' + rev: '7.1.1' hooks: - id: flake8 name: "Check for Python warnings" files: ^tools/.*$ types: [text, python] - repo: https://github.com/myint/rstcheck - rev: '3f92957478422df87bd730abde66f089cc1ee19b' + rev: 'v6.2.4' hooks: - id: rstcheck name: "Check RST syntax" From 83eb388968110f50d36359f6a6753da2cc96c414 Mon Sep 17 00:00:00 2001 From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:54:58 +0100 Subject: [PATCH 3/3] chore: fix more spelling mistakes caught by codespell --- source/conf.py | 2 +- source/hardware/controllers/hercules_dj_console_4_mx.rst | 2 +- source/hardware/controllers/hercules_dj_console_rmx.rst | 2 +- source/hardware/controllers/numark_n4.rst | 2 +- source/hardware/controllers/pioneer_ddj_sx.rst | 2 +- source/hardware/controllers/reloop_beatpad.rst | 2 +- source/hardware/controllers/reloop_terminal_mix_series.rst | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/conf.py b/source/conf.py index 65de9b4418..2bc7298c05 100644 --- a/source/conf.py +++ b/source/conf.py @@ -409,7 +409,7 @@ # The format is a list of tuples containing the path and title. # epub_pre_files = [] -# HTML files shat should be inserted after the pages created by sphinx. +# HTML files that should be inserted after the pages created by sphinx. # The format is a list of tuples containing the path and title. # epub_post_files = [] diff --git a/source/hardware/controllers/hercules_dj_console_4_mx.rst b/source/hardware/controllers/hercules_dj_console_4_mx.rst index d994596a6f..dd49cb335a 100644 --- a/source/hardware/controllers/hercules_dj_console_4_mx.rst +++ b/source/hardware/controllers/hercules_dj_console_4_mx.rst @@ -134,7 +134,7 @@ Deck / Channel specific controls | | jog pressed | | +-----------+----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Jog wheel | Up/Down | Moves up / down in the tracklist if either Up or Down are held down | -| | presssed | | +| | pressed | | +-----------+----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Jog wheel | LED | If the beatflash led has been set to jogwheel in the JavaScript file, the light of this button will be flashing following the beats of the song. | +-----------+----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ diff --git a/source/hardware/controllers/hercules_dj_console_rmx.rst b/source/hardware/controllers/hercules_dj_console_rmx.rst index 1be8e0bb30..6d9b43c636 100644 --- a/source/hardware/controllers/hercules_dj_console_rmx.rst +++ b/source/hardware/controllers/hercules_dj_console_rmx.rst @@ -83,7 +83,7 @@ Deck / Channel specific controls | | and moves to the beginning. | +----------------------------------+----------------------------------+ | Cue | Sets the cue point if a track is | -| | stopped and not at the curren | +| | stopped and not at the current | | | cue point | | | Stops track and returns to the | | | current cue point if a track is | diff --git a/source/hardware/controllers/numark_n4.rst b/source/hardware/controllers/numark_n4.rst index d99cfec013..0580365b26 100644 --- a/source/hardware/controllers/numark_n4.rst +++ b/source/hardware/controllers/numark_n4.rst @@ -305,4 +305,4 @@ Make sure its high enough within mixxx Booth/Gain Volume ^^^^^^^^^^^^^^^^^ -Behaves as espected (but doesn’t manipulate any mixxx controls). +Behaves as expected (but doesn’t manipulate any mixxx controls). diff --git a/source/hardware/controllers/pioneer_ddj_sx.rst b/source/hardware/controllers/pioneer_ddj_sx.rst index 4501e8a906..7faafb49d2 100644 --- a/source/hardware/controllers/pioneer_ddj_sx.rst +++ b/source/hardware/controllers/pioneer_ddj_sx.rst @@ -164,7 +164,7 @@ Figure Control Description 13 :hwlabel:`PARAMETER LEFT` Jump *beatjump_size* beats backward 13 :hwlabel:`SHIFT` + :hwlabel:`PARAMETER LEFT` Increase *beatjump_size* 14 :hwlabel:`PARAMETER RIGHT` Jump *beatjump_size* beats forward -14 :hwlabel:`SHIFT` + :hwlabel:`PARAMETER RIGHT` Decreate *beatjump_size* +14 :hwlabel:`SHIFT` + :hwlabel:`PARAMETER RIGHT` Decrease *beatjump_size* =============== ============================================= ================================================================================================================================= diff --git a/source/hardware/controllers/reloop_beatpad.rst b/source/hardware/controllers/reloop_beatpad.rst index 0829e8a52a..00187dccb0 100644 --- a/source/hardware/controllers/reloop_beatpad.rst +++ b/source/hardware/controllers/reloop_beatpad.rst @@ -165,7 +165,7 @@ SYNC that also have **quantize** enabled (which is enabled by default by the mapping) will always have their beats lined up. **Note :** the **quantize** mode is not mapped on the controller but can be - enabled/desabled from Mixxx. + enabled/disabled from Mixxx. .. _reloop-beatpad-jogwheel: diff --git a/source/hardware/controllers/reloop_terminal_mix_series.rst b/source/hardware/controllers/reloop_terminal_mix_series.rst index dcf61e0907..c12a545b57 100644 --- a/source/hardware/controllers/reloop_terminal_mix_series.rst +++ b/source/hardware/controllers/reloop_terminal_mix_series.rst @@ -229,7 +229,7 @@ deck.* - Turn: move the highlight up/down by one line - :hwlabel:`SHIFT` + turn: move the highlight one page up/down - - Press while Tree panel has focus: expand an item if possible. If item can’t be expanded further, it is selected and and highight is shifted rightwarde to the respective tracks table. + - Press while Tree panel has focus: expand an item if possible. If item can’t be expanded further, it is selected and and highlight is shifted rightwarde to the respective tracks table. - Press while tracks table has focus: perform the Track Load Action specified in :menuselection:`Preferences --> Library` (default: load track to next empty deck) - :hwlabel:`Volume Level Meter` @@ -241,7 +241,7 @@ deck.* - :hwlabel:`MIDI` LED (blue) - Flashes when a MIDI messages was sent - - When it flashes although no control is touched, it’s probably due to dust in the jogwheels (See :ref:`Controler Hardware / Maintenance `) + - When it flashes although no control is touched, it’s probably due to dust in the jogwheels (See :ref:`Controller Hardware / Maintenance `) - :hwlabel:`Shift Lock` switch at the back side