From 6d91cd04a327931676f0c8e6ed54dd2399f4802d Mon Sep 17 00:00:00 2001
From: Kyle Gabriel <kyletgabriel@gmail.com>
Date: Sun, 15 Oct 2023 19:12:30 -0400
Subject: [PATCH] v8.15.10 bugfix release

---
 CHANGELOG.md                       |  4 +++-
 README.rst                         |  2 +-
 docker/setup.sh                    |  2 +-
 mycodo/config.py                   |  2 +-
 mycodo/scripts/dependencies.sh     |  2 +-
 mycodo/scripts/upgrade_commands.sh | 10 +++++-----
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d67621ce6..ec5c01a8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
-## 8.15.10 (Unreleased)
+## 8.15.10 (2023.10.15)
+
+This release is a bugfix release to fix issues related to installing Mycodo on the latest Raspberry Pi OS (Debian 12, Bookworm).
 
 ### Bugfixes
 
diff --git a/README.rst b/README.rst
index fb12ca61e..3a7d8fb85 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ Mycodo
 
 Environmental Regulation System
 
-Latest version: 8.15.9
+Latest version: 8.15.10
 
 Mycodo is open source software for the Raspberry Pi that couples inputs and outputs in interesting ways to sense and manipulate the environment.
 
diff --git a/docker/setup.sh b/docker/setup.sh
index eb42b6a18..18cc0bd73 100755
--- a/docker/setup.sh
+++ b/docker/setup.sh
@@ -34,7 +34,7 @@ case "${1:-''}" in
         printf "\n#### All dependencies installed\n\n" 2>&1 | tee -a "${LOG_LOCATION}"
     ;;
     "test")
-        docker exec -ti mycodo_flask "${INSTALL_PATH}"/env/bin/python -m pip install --break-system-packages --upgrade -r /home/mycodo/mycodo/install/requirements-testing.txt
+        docker exec -ti mycodo_flask "${INSTALL_PATH}"/env/bin/python -m pip install --upgrade -r /home/mycodo/mycodo/install/requirements-testing.txt
         docker exec -ti mycodo_flask "${INSTALL_PATH}"/env/bin/python -m pytest /home/mycodo/mycodo/tests/software_tests
     ;;
     "clean-all")
diff --git a/mycodo/config.py b/mycodo/config.py
index c3abb7130..e0217fd25 100644
--- a/mycodo/config.py
+++ b/mycodo/config.py
@@ -13,7 +13,7 @@
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 from config_translations import TRANSLATIONS as T
 
-MYCODO_VERSION = '8.15.9'
+MYCODO_VERSION = '8.15.10'
 ALEMBIC_VERSION = '16b28ef31b5b'
 
 # FORCE UPGRADE MASTER
diff --git a/mycodo/scripts/dependencies.sh b/mycodo/scripts/dependencies.sh
index 0b1a37282..132f5b543 100755
--- a/mycodo/scripts/dependencies.sh
+++ b/mycodo/scripts/dependencies.sh
@@ -25,7 +25,7 @@ case "${1}" in
             printf "\n## Error: Virtualenv doesn't exist. Creating...\n"
             /bin/bash "${INSTALL_DIRECTORY}"/mycodo/scripts/upgrade_commands.sh setup-virtualenv
         fi
-        "${INSTALL_DIRECTORY}"/env/bin/python -m pip install --break-system-packages --upgrade "${2}"
+        "${INSTALL_DIRECTORY}"/env/bin/python -m pip install --upgrade "${2}"
     ;;
     'internal')
         case "${2}" in
diff --git a/mycodo/scripts/upgrade_commands.sh b/mycodo/scripts/upgrade_commands.sh
index 9595f7f06..693ad5fb2 100755
--- a/mycodo/scripts/upgrade_commands.sh
+++ b/mycodo/scripts/upgrade_commands.sh
@@ -602,7 +602,7 @@ case "${1:-''}" in
         if [[ ! -d ${MYCODO_PATH}/env ]]; then
             printf "\n## Error: Virtualenv doesn't exist. Create with %s setup-virtualenv\n" "${0}"
         else
-            "${MYCODO_PATH}"/env/bin/python -m pip install --break-system-packages --upgrade pip
+            "${MYCODO_PATH}"/env/bin/python -m pip install --upgrade pip
         fi
     ;;
     'update-pip3-packages')
@@ -611,8 +611,8 @@ case "${1:-''}" in
         if [[ ! -d ${MYCODO_PATH}/env ]]; then
             printf "\n## Error: Virtualenv doesn't exist. Create with %s setup-virtualenv\n" "${0}"
         else
-            "${MYCODO_PATH}"/env/bin/python -m pip install --break-system-packages --upgrade -r "${MYCODO_PATH}"/install/requirements.txt
-            "${MYCODO_PATH}"/env/bin/python -m pip install --break-system-packages --upgrade -r "${MYCODO_PATH}"/install/requirements-testing.txt
+            "${MYCODO_PATH}"/env/bin/python -m pip install --upgrade -r "${MYCODO_PATH}"/install/requirements.txt
+            "${MYCODO_PATH}"/env/bin/python -m pip install --upgrade -r "${MYCODO_PATH}"/install/requirements-testing.txt
         fi
     ;;
     'pip-clear-cache')
@@ -752,7 +752,7 @@ case "${1:-''}" in
         if [[ ! -d ${MYCODO_PATH}/env ]]; then
             printf "\n## Error: Virtualenv doesn't exist. Create with %s setup-virtualenv\n" "${0}"
         else
-            "${MYCODO_PATH}"/env/bin/python -m pip install --break-system-packages --upgrade pip
+            "${MYCODO_PATH}"/env/bin/python -m pip install --upgrade pip
         fi
     ;;
     'docker-update-pip-packages')
@@ -761,7 +761,7 @@ case "${1:-''}" in
         if [[ ! -d ${MYCODO_PATH}/env ]]; then
             printf "\n## Error: Virtualenv doesn't exist. Create with %s setup-virtualenv\n" "${0}"
         else
-            "${MYCODO_PATH}"/env/bin/python -m pip install --break-system-packages --no-cache-dir -r "${MYCODO_PATH}"/install/requirements.txt
+            "${MYCODO_PATH}"/env/bin/python -m pip install --no-cache-dir -r "${MYCODO_PATH}"/install/requirements.txt
         fi
     ;;
     'install-docker')