From 8fa74e8278b78d749dc351eca91e88dc43c82044 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Tue, 14 Jan 2025 10:44:51 +0100 Subject: [PATCH 1/2] Replace macos-12 with macos-13 --- .github/workflows/ci.yml | 10 +++++----- README.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a932af8c..9a90601ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-12] + os: [ubuntu-latest, windows-latest, macos-13] python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] architecture: [x64] include: @@ -31,13 +31,13 @@ jobs: python-version: '3.10' - os: windows-latest python-version: '3.12' - - os: macOS-12 + - os: macOS-13 python-version: '3.8' - - os: macOS-12 + - os: macOS-13 python-version: '3.9' - - os: macOS-12 + - os: macOS-13 python-version: '3.10' - - os: macOS-12 + - os: macOS-13 python-version: '3.12' fail-fast: false diff --git a/README.md b/README.md index c69d25327..1034a3324 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ The official URH docker image is available [here](https://hub.docker.com/r/jopoh ### macOS #### Using DMG -It is recommended to use __at least macOS 12__ when using the DMG available [here](https://github.com/jopohl/urh/releases). +It is recommended to use __at least macOS 13__ when using the DMG available [here](https://github.com/jopohl/urh/releases). #### With brew URH is available as a [homebrew formula](https://formulae.brew.sh/formula/urh) so you can install it with From bb6c3bc7b08a4dfac49ae6ff111b397101ef29f8 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Tue, 14 Jan 2025 11:02:19 +0100 Subject: [PATCH 2/2] fix typos in comments --- src/urh/awre/FormatFinder.py | 2 +- src/urh/dev/native/lib/limesdr.pyx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/urh/awre/FormatFinder.py b/src/urh/awre/FormatFinder.py index 79c39fef2..96a546395 100644 --- a/src/urh/awre/FormatFinder.py +++ b/src/urh/awre/FormatFinder.py @@ -486,7 +486,7 @@ def __handle_container_overlapping_conflict(container: CommonRangeContainer): possible_solutions.append(solution) # Take solution that maximizes score. In case of tie, choose solution with shorter total length. - # if there is still a tie prefer solution that contains a length field as is is very likely to be correct + # if there is still a tie prefer solution that contains a length field as it is very likely to be correct # if nothing else helps break tie by names of field types to prevent randomness best_solution = max( possible_solutions, diff --git a/src/urh/dev/native/lib/limesdr.pyx b/src/urh/dev/native/lib/limesdr.pyx index 321bd2aa5..6c7278a90 100644 --- a/src/urh/dev/native/lib/limesdr.pyx +++ b/src/urh/dev/native/lib/limesdr.pyx @@ -290,7 +290,7 @@ cpdef int set_antenna(size_t index): cpdef int get_antenna(): """ - Obtain currently selected antenna of the the specified RX or TX channel. + Obtain currently selected antenna of the specified RX or TX channel. :return: Index of selected antenna on success, (-1) on failure """