diff --git a/ci/python.sh b/ci/python.sh index fe69a41e..de65eb02 100644 --- a/ci/python.sh +++ b/ci/python.sh @@ -24,7 +24,7 @@ QA_IGNORE="E501,E402,COM812,ICN001" QA_EXCLUDE="micropython/examples/common/lib/tinyweb/server.py,micropython/examples/pico_wireless/*" function qa_prepare_all { - pip install ruff + pip install ruff==0.12.0 } function qa_check { diff --git a/micropython/examples/breakout_encoder/demo.py b/micropython/examples/breakout_encoder/demo.py index 20d77460..fbc0db51 100644 --- a/micropython/examples/breakout_encoder/demo.py +++ b/micropython/examples/breakout_encoder/demo.py @@ -14,7 +14,7 @@ enc.set_brightness(1.0) # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -33,7 +33,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/breakout_encoder_wheel/colour_picker.py b/micropython/examples/breakout_encoder_wheel/colour_picker.py index 857c1f69..47e83ab0 100644 --- a/micropython/examples/breakout_encoder_wheel/colour_picker.py +++ b/micropython/examples/breakout_encoder_wheel/colour_picker.py @@ -35,7 +35,7 @@ last_centre_pressed = False # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -54,7 +54,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/breakout_mics6814/demo.py b/micropython/examples/breakout_mics6814/demo.py index 27405302..3d781113 100644 --- a/micropython/examples/breakout_mics6814/demo.py +++ b/micropython/examples/breakout_mics6814/demo.py @@ -14,7 +14,7 @@ gas.set_brightness(1.0) # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -33,7 +33,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/breakout_potentiometer/demo.py b/micropython/examples/breakout_potentiometer/demo.py index 86787b85..2770ac7e 100644 --- a/micropython/examples/breakout_potentiometer/demo.py +++ b/micropython/examples/breakout_potentiometer/demo.py @@ -13,7 +13,7 @@ pot.set_brightness(1.0) # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -32,7 +32,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/breakout_roundlcd/demo.py b/micropython/examples/breakout_roundlcd/demo.py index 8ceac04e..a9fc9ca7 100644 --- a/micropython/examples/breakout_roundlcd/demo.py +++ b/micropython/examples/breakout_roundlcd/demo.py @@ -11,7 +11,7 @@ RADIUS = WIDTH // 2 BLACK = display.create_pen(0, 0, 0) -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) # XXX assume int() truncates! @@ -30,7 +30,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/gfx_pack/co2.py b/micropython/examples/gfx_pack/co2.py index 826abec9..c883af5d 100644 --- a/micropython/examples/gfx_pack/co2.py +++ b/micropython/examples/gfx_pack/co2.py @@ -36,7 +36,7 @@ def clear(): # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -55,7 +55,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/gfx_pack/rainbow.py b/micropython/examples/gfx_pack/rainbow.py index 6d4f8ceb..d1cd2f49 100644 --- a/micropython/examples/gfx_pack/rainbow.py +++ b/micropython/examples/gfx_pack/rainbow.py @@ -15,7 +15,7 @@ DANCE_TIME = 1.0 # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -34,7 +34,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/gfx_pack/zoo_facts.py b/micropython/examples/gfx_pack/zoo_facts.py index ccfac9f4..e2046c77 100644 --- a/micropython/examples/gfx_pack/zoo_facts.py +++ b/micropython/examples/gfx_pack/zoo_facts.py @@ -132,7 +132,7 @@ except Exception as e: # noqa: BLE001 # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -151,7 +151,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/keybow2040/usb_rgb_keypad.py b/micropython/examples/keybow2040/usb_rgb_keypad.py index 82ebbc0c..545dc9cd 100644 --- a/micropython/examples/keybow2040/usb_rgb_keypad.py +++ b/micropython/examples/keybow2040/usb_rgb_keypad.py @@ -36,7 +36,7 @@ MAX_ON_TIME = 20.0 # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -55,7 +55,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/pico_display/rainbow.py b/micropython/examples/pico_display/rainbow.py index 423cf41b..07379dcc 100644 --- a/micropython/examples/pico_display/rainbow.py +++ b/micropython/examples/pico_display/rainbow.py @@ -28,7 +28,7 @@ led = RGBLED(6, 7, 8) # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -47,7 +47,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/pico_enviro/lcd.py b/micropython/examples/pico_enviro/lcd.py index dc2a4089..6c552637 100644 --- a/micropython/examples/pico_enviro/lcd.py +++ b/micropython/examples/pico_enviro/lcd.py @@ -14,7 +14,7 @@ WIDTH, HEIGHT = display.get_bounds() # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -33,7 +33,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/pico_explorer/rainbow.py b/micropython/examples/pico_explorer/rainbow.py index ef40bccd..d01fbb59 100644 --- a/micropython/examples/pico_explorer/rainbow.py +++ b/micropython/examples/pico_explorer/rainbow.py @@ -12,7 +12,7 @@ BLACK = display.create_pen(0, 0, 0) # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -31,7 +31,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/pico_unicorn/demo.py b/micropython/examples/pico_unicorn/demo.py index afaa1593..d677fb35 100644 --- a/micropython/examples/pico_unicorn/demo.py +++ b/micropython/examples/pico_unicorn/demo.py @@ -4,7 +4,7 @@ picounicorn = PicoUnicorn() # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -23,7 +23,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/pico_unicorn/rainbow.py b/micropython/examples/pico_unicorn/rainbow.py index fcdd025b..1c765ed6 100644 --- a/micropython/examples/pico_unicorn/rainbow.py +++ b/micropython/examples/pico_unicorn/rainbow.py @@ -5,7 +5,7 @@ picounicorn = PicoUnicorn() # From CPython Lib/colorsys.py -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -24,7 +24,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/plasma_stick/encoder.py b/micropython/examples/plasma_stick/encoder.py index bf7ad3d7..eda697ac 100644 --- a/micropython/examples/plasma_stick/encoder.py +++ b/micropython/examples/plasma_stick/encoder.py @@ -20,7 +20,7 @@ enc.set_brightness(1.0) # enc.set_direction(BreakoutEncoder.DIRECTION_CCW) # Uncomment this to flip the direction -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 # From CPython Lib/colorsys.py if s == 0.0: return v, v, v @@ -40,7 +40,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/tufty2040/main.py b/micropython/examples/tufty2040/main.py index bf1fd245..1ad713a9 100644 --- a/micropython/examples/tufty2040/main.py +++ b/micropython/examples/tufty2040/main.py @@ -7,7 +7,7 @@ from picographics import PicoGraphics, DISPLAY_TUFTY_2040, PEN_RGB332 from pimoroni import Button -def hsv_to_rgb(h: float, s: float, v: float) -> tuple[float, float, float]: +def hsv_to_rgb(h: float, s: float, v: float) -> tuple[float, float, float]: # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -30,7 +30,7 @@ def hsv_to_rgb(h: float, s: float, v: float) -> tuple[float, float, float]: return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q diff --git a/micropython/examples/tufty2040/wavy_message.py b/micropython/examples/tufty2040/wavy_message.py index 4242db76..08de5106 100644 --- a/micropython/examples/tufty2040/wavy_message.py +++ b/micropython/examples/tufty2040/wavy_message.py @@ -6,7 +6,7 @@ display = PicoGraphics(display=DISPLAY_TUFTY_2040, pen_type=PEN_RGB332, rotate=1 # convert a hue, saturation, and value into rgb values -def hsv_to_rgb(h, s, v): +def hsv_to_rgb(h, s, v): # noqa: RET503 if s == 0.0: return v, v, v i = int(h * 6.0) @@ -24,7 +24,7 @@ def hsv_to_rgb(h, s, v): return p, q, v if i == 4: return t, p, v - if i == 5: # noqa: RET503 + if i == 5: return v, p, q