From 52e4a92aec66af8df89192b58f88d7f6d8355242 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 00:19:13 -0700
Subject: [PATCH] Bump black from 22.8.0 to 24.3.0 in /python/web (#1444)

* Bump black from 22.8.0 to 24.3.0 in /python/web

Bumps [black](https://github.com/psf/black) from 22.8.0 to 24.3.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.8.0...24.3.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* Github CI: Backend web test runner use python 3.9.19

* Reformat python sources with black

* Docker: Bump to python 3.9-slim image for pytest

* Bump pytest version to 8.1.1

* Bump more library versions, and freeze them

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Markstedt <daniel@mindani.net>
---
 .github/workflows/web.yml                     |  2 +-
 docker/pytest/Dockerfile                      |  2 +-
 python/common/src/piscsi/piscsi_cmds.py       |  6 ++---
 python/common/src/piscsi/sys_cmds.py          |  1 +
 python/ctrlboard/src/config.py                |  1 +
 .../ctrlboard_menu_update_event_handler.py    |  1 +
 .../ctrlboard_print_event_handler.py          |  1 +
 .../piscsi_profile_cycler.py                  |  1 +
 .../piscsi_shutdown_cycler.py                 |  1 +
 .../src/ctrlboard_hw/ctrlboard_hw.py          |  1 +
 python/ctrlboard/src/ctrlboard_hw/encoder.py  |  1 +
 .../src/ctrlboard_hw/pca9554multiplexer.py    |  1 +
 .../ctrlboard/src/ctrlboard_menu_builder.py   |  1 +
 python/ctrlboard/src/main.py                  |  1 +
 .../ctrlboard/src/menu/blank_screensaver.py   |  1 +
 python/ctrlboard/src/menu/cycler.py           |  1 +
 python/ctrlboard/src/menu/menu.py             |  1 +
 python/ctrlboard/src/menu/menu_builder.py     |  1 +
 python/ctrlboard/src/menu/menu_controller.py  |  1 +
 python/ctrlboard/src/menu/menu_renderer.py    |  1 +
 .../menu/menu_renderer_adafruit_ssd1306.py    |  1 +
 .../src/menu/menu_renderer_luma_oled.py       |  1 +
 python/ctrlboard/src/menu/screensaver.py      |  1 +
 python/ctrlboard/src/menu/timer.py            |  1 +
 python/ctrlboard/src/menu/transition.py       |  1 +
 python/ctrlboard/src/observable.py            |  1 +
 python/ctrlboard/src/observer.py              |  1 +
 .../ctrlboard/src/piscsi_menu_controller.py   |  1 +
 python/oled/src/interrupt_handler.py          |  1 +
 python/web/requirements-dev.txt               | 27 ++++++++++++++++---
 30 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 054c0c07..48af6b9b 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.7.15
+          python-version: 3.9.19
           cache: 'pip'
 
       - run: pip install -r web/requirements-dev.txt
diff --git a/docker/pytest/Dockerfile b/docker/pytest/Dockerfile
index 10bda346..858a6902 100644
--- a/docker/pytest/Dockerfile
+++ b/docker/pytest/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-slim
+FROM python:3.9-slim
 ENV DOCKER=1
 
 WORKDIR /src
diff --git a/python/common/src/piscsi/piscsi_cmds.py b/python/common/src/piscsi/piscsi_cmds.py
index 408f8b76..4dbd5cf0 100644
--- a/python/common/src/piscsi/piscsi_cmds.py
+++ b/python/common/src/piscsi/piscsi_cmds.py
@@ -85,9 +85,9 @@ class PiscsiCmds:
                         if PurePath(member["path"]).suffix.lower()[1:] == PROPERTIES_SUFFIX:
                             member["is_properties_file"] = True
                         elif f"{member['path']}.{PROPERTIES_SUFFIX}" in properties_files:
-                            member[
-                                "related_properties_file"
-                            ] = f"{member['path']}.{PROPERTIES_SUFFIX}"
+                            member["related_properties_file"] = (
+                                f"{member['path']}.{PROPERTIES_SUFFIX}"
+                            )
 
                         archive_contents.append(member)
                 except (unarchiver.LsarCommandError, unarchiver.LsarOutputError):
diff --git a/python/common/src/piscsi/sys_cmds.py b/python/common/src/piscsi/sys_cmds.py
index 37c85f4a..a76ff88b 100644
--- a/python/common/src/piscsi/sys_cmds.py
+++ b/python/common/src/piscsi/sys_cmds.py
@@ -1,6 +1,7 @@
 """
 Module with methods that interact with the Pi system
 """
+
 import subprocess
 import logging
 import sys
diff --git a/python/ctrlboard/src/config.py b/python/ctrlboard/src/config.py
index 2f956653..ce6dc154 100644
--- a/python/ctrlboard/src/config.py
+++ b/python/ctrlboard/src/config.py
@@ -1,6 +1,7 @@
 """
 Module for central PiSCSI control board configuration parameters
 """
+
 from ctrlboard_hw.ctrlboard_hw_constants import CtrlBoardHardwareConstants
 
 
diff --git a/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_menu_update_event_handler.py b/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_menu_update_event_handler.py
index 45e53ce5..e7d1c2f8 100644
--- a/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_menu_update_event_handler.py
+++ b/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_menu_update_event_handler.py
@@ -1,4 +1,5 @@
 """Module for interfacing between the menu controller and the PiSCSI Control Board hardware"""
+
 import logging
 from typing import Optional
 
diff --git a/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_print_event_handler.py b/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_print_event_handler.py
index fad6fc67..b4088cb1 100644
--- a/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_print_event_handler.py
+++ b/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_print_event_handler.py
@@ -1,4 +1,5 @@
 """Module for test printing events when buttons from the PiSCSI Control Board are pressed"""
+
 import observer
 from ctrlboard_hw.hardware_button import HardwareButton
 from ctrlboard_hw.encoder import Encoder
diff --git a/python/ctrlboard/src/ctrlboard_event_handler/piscsi_profile_cycler.py b/python/ctrlboard/src/ctrlboard_event_handler/piscsi_profile_cycler.py
index 4160754a..3c475800 100644
--- a/python/ctrlboard/src/ctrlboard_event_handler/piscsi_profile_cycler.py
+++ b/python/ctrlboard/src/ctrlboard_event_handler/piscsi_profile_cycler.py
@@ -1,4 +1,5 @@
 """Module providing the profile cycler class for the PiSCSI Control Board UI"""
+
 from ctrlboard_menu_builder import CtrlBoardMenuBuilder
 from menu.cycler import Cycler
 
diff --git a/python/ctrlboard/src/ctrlboard_event_handler/piscsi_shutdown_cycler.py b/python/ctrlboard/src/ctrlboard_event_handler/piscsi_shutdown_cycler.py
index 474f4bcf..50f67703 100644
--- a/python/ctrlboard/src/ctrlboard_event_handler/piscsi_shutdown_cycler.py
+++ b/python/ctrlboard/src/ctrlboard_event_handler/piscsi_shutdown_cycler.py
@@ -1,4 +1,5 @@
 """Module providing the shutdown cycler for the PiSCSI Control Board UI """
+
 from menu.cycler import Cycler
 
 
diff --git a/python/ctrlboard/src/ctrlboard_hw/ctrlboard_hw.py b/python/ctrlboard/src/ctrlboard_hw/ctrlboard_hw.py
index 6915f278..0c981548 100644
--- a/python/ctrlboard/src/ctrlboard_hw/ctrlboard_hw.py
+++ b/python/ctrlboard/src/ctrlboard_hw/ctrlboard_hw.py
@@ -1,4 +1,5 @@
 """Module providing the interface to the PiSCSI Control Board hardware"""
+
 # noinspection PyUnresolvedReferences
 import logging
 import time
diff --git a/python/ctrlboard/src/ctrlboard_hw/encoder.py b/python/ctrlboard/src/ctrlboard_hw/encoder.py
index 18166034..05b3d4f0 100644
--- a/python/ctrlboard/src/ctrlboard_hw/encoder.py
+++ b/python/ctrlboard/src/ctrlboard_hw/encoder.py
@@ -1,5 +1,6 @@
 """Module containing an implementation for reading the rotary encoder directions through
 the i2c multiplexer + interrupt"""
+
 from ctrlboard_hw.hardware_button import HardwareButton
 
 
diff --git a/python/ctrlboard/src/ctrlboard_hw/pca9554multiplexer.py b/python/ctrlboard/src/ctrlboard_hw/pca9554multiplexer.py
index e03da186..27006b9b 100644
--- a/python/ctrlboard/src/ctrlboard_hw/pca9554multiplexer.py
+++ b/python/ctrlboard/src/ctrlboard_hw/pca9554multiplexer.py
@@ -1,6 +1,7 @@
 """
 Module for interfacting with the pca9554 multiplexer
 """
+
 # pylint: disable=c-extension-no-member
 import logging
 import smbus
diff --git a/python/ctrlboard/src/ctrlboard_menu_builder.py b/python/ctrlboard/src/ctrlboard_menu_builder.py
index afdcb7f9..08bb1264 100644
--- a/python/ctrlboard/src/ctrlboard_menu_builder.py
+++ b/python/ctrlboard/src/ctrlboard_menu_builder.py
@@ -1,4 +1,5 @@
 """Module for building the control board UI specific menus"""
+
 import logging
 
 from menu.menu import Menu
diff --git a/python/ctrlboard/src/main.py b/python/ctrlboard/src/main.py
index 926bf345..2f164def 100644
--- a/python/ctrlboard/src/main.py
+++ b/python/ctrlboard/src/main.py
@@ -1,4 +1,5 @@
 """Module is the entry point for the PiSCSI Control Board UI"""
+
 import argparse
 import sys
 import logging
diff --git a/python/ctrlboard/src/menu/blank_screensaver.py b/python/ctrlboard/src/menu/blank_screensaver.py
index bc55eaca..f81b68a3 100644
--- a/python/ctrlboard/src/menu/blank_screensaver.py
+++ b/python/ctrlboard/src/menu/blank_screensaver.py
@@ -1,4 +1,5 @@
 """Module implementing a blank screensaver"""
+
 from menu.screensaver import ScreenSaver
 
 
diff --git a/python/ctrlboard/src/menu/cycler.py b/python/ctrlboard/src/menu/cycler.py
index aa785084..84b3518d 100644
--- a/python/ctrlboard/src/menu/cycler.py
+++ b/python/ctrlboard/src/menu/cycler.py
@@ -1,4 +1,5 @@
 """Module that implements a button cycling functionality"""
+
 from abc import abstractmethod
 from menu.timer import Timer
 from piscsi.file_cmds import FileCmds
diff --git a/python/ctrlboard/src/menu/menu.py b/python/ctrlboard/src/menu/menu.py
index ba465373..a5f41661 100644
--- a/python/ctrlboard/src/menu/menu.py
+++ b/python/ctrlboard/src/menu/menu.py
@@ -1,4 +1,5 @@
 """Module for creating a menu"""
+
 from typing import List
 
 
diff --git a/python/ctrlboard/src/menu/menu_builder.py b/python/ctrlboard/src/menu/menu_builder.py
index ce2f0ca2..608d2f02 100644
--- a/python/ctrlboard/src/menu/menu_builder.py
+++ b/python/ctrlboard/src/menu/menu_builder.py
@@ -1,4 +1,5 @@
 """Module for creating menus"""
+
 from abc import ABC, abstractmethod
 from menu.menu import Menu
 
diff --git a/python/ctrlboard/src/menu/menu_controller.py b/python/ctrlboard/src/menu/menu_controller.py
index 6fe03c15..d9353f72 100644
--- a/python/ctrlboard/src/menu/menu_controller.py
+++ b/python/ctrlboard/src/menu/menu_controller.py
@@ -1,4 +1,5 @@
 """Module providing the menu controller."""
+
 import time
 import importlib
 from typing import Dict, Optional
diff --git a/python/ctrlboard/src/menu/menu_renderer.py b/python/ctrlboard/src/menu/menu_renderer.py
index aec3edb4..95b3643b 100644
--- a/python/ctrlboard/src/menu/menu_renderer.py
+++ b/python/ctrlboard/src/menu/menu_renderer.py
@@ -1,4 +1,5 @@
 """Module provides the abstract menu renderer class"""
+
 import time
 import math
 import itertools
diff --git a/python/ctrlboard/src/menu/menu_renderer_adafruit_ssd1306.py b/python/ctrlboard/src/menu/menu_renderer_adafruit_ssd1306.py
index 73646fc0..f2eb19af 100644
--- a/python/ctrlboard/src/menu/menu_renderer_adafruit_ssd1306.py
+++ b/python/ctrlboard/src/menu/menu_renderer_adafruit_ssd1306.py
@@ -1,4 +1,5 @@
 """Module providing the Adafruit SSD1306 menu renderer class"""
+
 # pylint: disable=import-error
 from board import SCL, SDA
 import busio
diff --git a/python/ctrlboard/src/menu/menu_renderer_luma_oled.py b/python/ctrlboard/src/menu/menu_renderer_luma_oled.py
index eb29f6ac..9ba02192 100644
--- a/python/ctrlboard/src/menu/menu_renderer_luma_oled.py
+++ b/python/ctrlboard/src/menu/menu_renderer_luma_oled.py
@@ -1,4 +1,5 @@
 """Module providing the luma oled menu renderer class"""
+
 from luma.core.interface.serial import i2c
 from menu.menu_renderer import MenuRenderer
 
diff --git a/python/ctrlboard/src/menu/screensaver.py b/python/ctrlboard/src/menu/screensaver.py
index f291f753..923688e3 100644
--- a/python/ctrlboard/src/menu/screensaver.py
+++ b/python/ctrlboard/src/menu/screensaver.py
@@ -1,4 +1,5 @@
 """Module providing the menu screensaver class"""
+
 from abc import abstractmethod
 from menu.timer import Timer
 
diff --git a/python/ctrlboard/src/menu/timer.py b/python/ctrlboard/src/menu/timer.py
index 9335ecc2..16b87ad6 100644
--- a/python/ctrlboard/src/menu/timer.py
+++ b/python/ctrlboard/src/menu/timer.py
@@ -1,4 +1,5 @@
 """Module providing a timer class"""
+
 import time
 
 
diff --git a/python/ctrlboard/src/menu/transition.py b/python/ctrlboard/src/menu/transition.py
index d6fbe7ec..e436ffe6 100644
--- a/python/ctrlboard/src/menu/transition.py
+++ b/python/ctrlboard/src/menu/transition.py
@@ -1,4 +1,5 @@
 """Module providing implementations for menu transitions."""
+
 from abc import abstractmethod
 from PIL import Image
 
diff --git a/python/ctrlboard/src/observable.py b/python/ctrlboard/src/observable.py
index 5da2db18..aa173717 100644
--- a/python/ctrlboard/src/observable.py
+++ b/python/ctrlboard/src/observable.py
@@ -1,4 +1,5 @@
 """Module for Observable part of the Observer pattern functionality"""
+
 from typing import List
 from observer import Observer
 
diff --git a/python/ctrlboard/src/observer.py b/python/ctrlboard/src/observer.py
index 98eab37b..17f24d99 100644
--- a/python/ctrlboard/src/observer.py
+++ b/python/ctrlboard/src/observer.py
@@ -1,4 +1,5 @@
 """Module implementing the Observer part of the Observer pattern"""
+
 from abc import ABC, abstractmethod
 
 
diff --git a/python/ctrlboard/src/piscsi_menu_controller.py b/python/ctrlboard/src/piscsi_menu_controller.py
index 6e7ae6cf..57bc5b01 100644
--- a/python/ctrlboard/src/piscsi_menu_controller.py
+++ b/python/ctrlboard/src/piscsi_menu_controller.py
@@ -1,4 +1,5 @@
 """Module implementing the PiSCSI Control Board UI specific menu controller"""
+
 from ctrlboard_menu_builder import CtrlBoardMenuBuilder
 from menu.menu_builder import MenuBuilder
 from menu.menu_controller import MenuController
diff --git a/python/oled/src/interrupt_handler.py b/python/oled/src/interrupt_handler.py
index b7b71110..f6e9cf24 100644
--- a/python/oled/src/interrupt_handler.py
+++ b/python/oled/src/interrupt_handler.py
@@ -1,6 +1,7 @@
 """
 Linux interrupt handling module
 """
+
 import signal
 
 
diff --git a/python/web/requirements-dev.txt b/python/web/requirements-dev.txt
index f65d5f8c..5f8bf325 100644
--- a/python/web/requirements-dev.txt
+++ b/python/web/requirements-dev.txt
@@ -1,7 +1,26 @@
-pytest==7.1.3
-pytest-httpserver==1.0.6
-black==22.8.0
+attrs==23.2.0
+black==24.3.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+click==8.1.7
 flake8==5.0.4
-watchdog==2.1.9
+idna==3.6
+iniconfig==2.0.0
+MarkupSafe==2.1.5
+mccabe==0.7.0
+mypy-extensions==1.0.0
+packaging==24.0
+pathspec==0.12.1
+platformdirs==4.2.0
+pluggy==1.4.0
+py==1.11.0
+pycodestyle==2.9.1
+pyflakes==2.5.0
+pytest==8.1.1
+pytest_httpserver==1.0.10
 requests==2.31.0
+tomli==2.0.1
+urllib3==2.2.1
 vcgencmd==0.1.1
+watchdog==4.0.0
+Werkzeug==3.0.1