Revert "Switched ExcludeRegion to the Python 3 fork"

This reverts commit 6ada361238.

TODO.md

@@ -3,10 +3,6 @@
 ## First time/TP-Config
 - Add network configuration (replace nmtui)
 - Add hostname configuration (replace nmtui)
-- Import/export settings
-
-## OctoPrint
-- Python 3
 
 ## Misc
 - Cleanup
@@ -15,4 +11,5 @@
 
 ## Things to consider
 - Wayland using labwc/waybox
+- Python 3
 - Detect if frontend did not load correctly (probably not easy)

stage2/04-octoprint/00-packages

@@ -1,7 +1,7 @@
-python3-pip
+python-pip
-python3-dev
+python-dev
-python3-setuptools
+python-setuptools
-python3-venv
+python-virtualenv
 git
 libyaml-dev
 nginx

stage2/04-octoprint/01-run.sh

@@ -23,8 +23,9 @@ systemctl disable nginx
 
 # If OctoPrint already exists, skip this (for debugging)
 if [[ ! -f /srv/octoprint/bin/octoprint ]]; then
-  python3 -m venv /srv/octoprint || exit 1
+  cd /srv/ || exit 1
-  source /srv/octoprint/bin/activate || exit 1
+  virtualenv octoprint || exit 1
+  source octoprint/bin/activate || exit 1
   pip install pip --upgrade 
   pip install octoprint || exit 1
   # Fix permissions

stage2/06-utils/files/first-time.sh

@@ -41,7 +41,7 @@ recommended_menu () {
     echo $(( $i * 100 / ${#RECOMMEND_MENU[@]} )) | dialog --title "Plugin Manager" --gauge "Installing ${RECOMMEND_MENU[$i]}" 10 50
     case ${RECOMMEND_MENU[$i]} in
       "OctoPrint-Dashboard") install_package "https://github.com/StefanCohen/OctoPrint-Dashboard/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]}; install_package "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip" || error_install ${RECOMMEND_MENU[$i]};;
-      "ExcludeRegion") install_package "https://github.com/bradcfisher/OctoPrint-ExcludeRegionPlugin/archive/feature/python3_compat.zip" || error_install ${RECOMMEND_MENU[$i]};;
+      "ExcludeRegion") install_package "https://github.com/bradcfisher/OctoPrint-ExcludeRegionPlugin/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};;
       "NavbarTemp") install_package "https://github.com/imrahil/OctoPrint-NavbarTemp/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};;
       "PrintTimeGenius") install_package "https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};;
       "HeaterTimeout") install_package "https://github.com/google/OctoPrint-HeaterTimeout/archive/master.zip" || error_install ${RECOMMEND_MENU[$i]};;