Preparations for Python 3.5 D-Day.

docs/python.md

@@ -1,13 +1,9 @@
 # Pyhton
 
-It is not recomended running this script.  
-**It is recomended to download and install the newest
-[Hassbian image][hassbian-image] instead of running this.**  
-
-This script will upgrade Python to the latest stable version.\
+This script will upgrade Python and Home Assistant to the latest stable version.\
 It will also create a new virtual environment to be used for Home Assistant.\
 _This upgrade takes long time to finish, on an Raspberry Pi 3
-this took about 1 hour._
+this takes about 1 hour._
 
 ## Upgrade
 
@@ -17,8 +13,8 @@ sudo hassbian-config upgrade python
 
 ## Additional info
 
-If you have installed additional components directly to `/srv/homeassistant/`
-like `libcec` thoese will need to be reinstalled.
+If you have installed additional packages directly to `/srv/homeassistant/`
+like `libcec` those will need to be reinstalled.
 
 ***
 
@@ -27,5 +23,4 @@ With inspiration from [blog.ceard.tech][blog].
 
 <!--- Links --->
 [blog]: https://blog.ceard.tech/2017/12/upgrading-python-virtual-environment.html
-[hassbian-image]: https://github.com/home-assistant/pi-gen/releases/latest
 [ludeeus]: https://github.com/ludeeus

package/opt/hassbian/suites/homeassistant.sh

@@ -11,25 +11,99 @@ function homeassistant-show-copyright-info {
   echo "Copyright(c) 2017 Fredrik Lindqvist <https://github.com/Landrash>."
 }
 
+function python-migration {
+  # Implemented to cope with the announced D-Day of Python 3.5
+  # To track if this allready have been run, we create a file to hold that "state"
+  # /srv/homeassistant/hassbian/pythonmigration with HAVENV=pythonversion as the content.
+
+  readonly pythonmigrationfile='/srv/homeassistant/hassbian/pythonmigration'
+  readonly targetpythonversion='3.7'
+  readonly haversionwithrequirement='0.98.0'
+
+  # Get the current python version HA is running under.
+  currenthapyversion
+
+  # Check if the file exist
+  if [ ! -f "$pythonmigrationfile" ]; then
+    # file does not exist, let's create it.
+    echo "HAVENV=$CURRENTHAPYVERSION" > "$pythonmigrationfile"
+  fi
+
+  # Checks to see if migration is needed.
+  pyversion=$(grep "HAVENV" $pythonmigrationfile | awk -F'=' '{print $2}')
+  if [[ "${pyversion:0:3}" == "$targetpythonversion" ]]; then
+    # Migration not needed.
+    return 0
+  fi
+
+  if [[ "${CURRENTHAPYVERSION:0:3}" == "$targetpythonversion" ]]; then
+    # Migration not needed.
+    echo "HAVENV=$CURRENTHAPYVERSION" > "$pythonmigrationfile"
+    return 0
+  fi
+
+  # Check if migration is needed for the newest HA version.
+  newversion=$(curl -s https://api.github.com/repos/home-assistant/home-assistant/releases/latest | grep tag_name | awk -F'"' '{print $4}')
+  if [[ "$newversion" < "$haversionwithrequirement" ]]; then
+    # Migration not yet needed, store the current version.
+    echo "HAVENV=$CURRENTHAPYVERSION" > "$pythonmigrationfile"
+    echo
+    echo "A migration of your python virtual enviorment for Home Assistant will be needed."
+    echo "This will take about 1 hour on a raspberry pi 3."
+    echo "When version $haversionwithrequirement is live you will not have a choise."
+    echo
+    echo -n "Do you want to start this migration now? [N/y] : "
+    read -r RESPONSE
+    if [ "$RESPONSE" == "y" ] || [ "$RESPONSE" == "Y" ]; then
+      source /opt/hassbian/suites/python.sh
+      python-upgrade-package
+
+      # Quit when execution is done.
+      exit 0
+    fi
+  else
+    # If we get here a migration is needed.
+    echo "
+#
+# MIGRATION IN PROGRESS
+# THIS WILL TAKE A LONG TIME, IT IS IMPORTANT THAT YOU DO NOT INTERRUPT THIS
+#
+#
+#
+# AFTER THIS MIGRATION YOUR HOME ASSISTANT INSTANCE WILL BE RUNNING UNDER PYTHON $targetpythonversion
+#"
+    sleep 20
+    source /opt/hassbian/suites/python.sh
+    python-upgrade-package
+
+    # Quit when execution is done.
+    exit 0
+  fi
+
+}
+
 function homeassistant-install-package {
 echo "Setting correct premissions"
 chown homeassistant:homeassistant -R /srv/homeassistant
 
+# Check if migration is needed.
+python-migration
+
 echo "Changing to the homeassistant user"
 sudo -u homeassistant -H /bin/bash << EOF
 
-echo "Creating Home Assistant venv"
-python3 -m venv /srv/homeassistant
+  echo "Creating Home Assistant venv"
+  python3 -m venv /srv/homeassistant
 
-echo "Changing to Home Assistant venv"
-source /srv/homeassistant/bin/activate
+  echo "Changing to Home Assistant venv"
+  source /srv/homeassistant/bin/activate
 
-echo "Installing latest version of Home Assistant"
-python3 -m pip install setuptools wheel
-python3 -m pip install homeassistant
+  echo "Installing latest version of Home Assistant"
+  python3 -m pip install setuptools wheel
+  python3 -m pip install homeassistant
 
-echo "Deactivating virtualenv"
-deactivate
+  echo "Deactivating virtualenv"
+  deactivate
 EOF
 
 echo "Enabling Home Assistant service"
@@ -64,6 +138,9 @@ return 0
 }
 
 function homeassistant-upgrade-package {
+# Check if migration is needed.
+python-migration
+
 if [ "$DEV" == "true"  ]; then
   echo "This script downloads Home Assistant directly from the dev branch on Github."
   echo "you can use this to be on the 'bleeding edge of the development of Home Assistant.'"

package/opt/hassbian/suites/python.sh

@@ -12,64 +12,49 @@ function python-show-copyright-info {
 }
 
 function python-upgrade-package {
-if [ "$FORCE" == "" ]; then
-  printf "\\n\\n"
-  echo "This script will change a lot on your pi."
-  echo "DO NOT run this if it's not absolutely necessary"
-  echo "You can force run the upgrade script like this:"
-  echo "sudo hassbian-config upgrade python --force"
-  return 0
-fi
-
-printf "\\n\\n"
-echo "It is NOT recomended to run this."
-echo -n "Are you absolutely sure you want to run this script? [N/y]: "
-read -r RESPONSE
-if [ "$RESPONSE" == "y" ] || [ "$RESPONSE" == "Y" ]; then
-  RESPONSE="Y"
-else
-  return 0
-fi
 
 PYTHONVERSION=$(curl -s https://www.python.org/downloads/source/ | grep "Latest Python 3 Release" | cut -d "<" -f 3 | awk -F ' ' '{print $NF}')
 
 echo "Checking current version..."
-currentpython=$(sudo -u homeassistant -H /bin/bash << EOF | awk -F ' ' '{print $NF}'
-source /srv/homeassistant/bin/activate
-python -V
-EOF
-)
+currenthapyversion
+hapyversion=$"$CURRENTHAPYVERSION"
 
-if [ "$currentpython" == "$PYTHONVERSION" ]; then
+if [ "$hapyversion" == "$PYTHONVERSION" ]; then
   echo "Python is already the highest stable version.."
   return 0
 fi
-echo "Upgrading to Python $PYTHONVERSION"
-apt-get -y update
-apt-get install -y build-essential tk-dev libncurses5-dev libncursesw5-dev libreadline6-dev libdb5.3-dev libgdbm-dev libsqlite3-dev libssl-dev libbz2-dev libexpat1-dev liblzma-dev zlib1g-dev
-apt-get install libtcmalloc-minimal4
-export LD_PRELOAD="/usr/lib/libtcmalloc_minimal.so.4"
-cd /tmp || return 1
-wget https://www.python.org/ftp/python/"$PYTHONVERSION"/Python-"$PYTHONVERSION".tar.xz
-tar xf Python-"$PYTHONVERSION".tar.xz
-cd Python-"$PYTHONVERSION" || return 1
-./configure
-make altinstall
-apt -y autoremove
-cd  || return 1
-rm -r /tmp/Python-"$PYTHONVERSION"
-rm /tmp/Python-"$PYTHONVERSION".tar.xz
-echo "Done"
 
+isinstalled=$(which python"${PYTHONVERSION:0:3}")
+if [ ! -z "${isinstalled}" ]; then
+  currentversion$(python"${PYTHONVERSION:0:3}" -V)
+  if [[ "${currentversion:6}" != "$PYTHONVERSION" ]]; then
+    echo "Upgrading to Python $PYTHONVERSION"
+    apt-get -y update
+    apt-get install -y build-essential tk-dev libncurses5-dev libncursesw5-dev libreadline6-dev libdb5.3-dev libgdbm-dev libsqlite3-dev libssl-dev libbz2-dev libexpat1-dev liblzma-dev zlib1g-dev
+    apt-get install libtcmalloc-minimal4
+    export LD_PRELOAD="/usr/lib/libtcmalloc_minimal.so.4"
+    cd /tmp || return 1
+    wget https://www.python.org/ftp/python/"$PYTHONVERSION"/Python-"$PYTHONVERSION".tar.xz
+    tar xf Python-"$PYTHONVERSION".tar.xz
+    cd Python-"$PYTHONVERSION" || return 1
+    ./configure
+    make altinstall
+    apt -y autoremove
+    cd  || return 1
+    rm -r /tmp/Python-"$PYTHONVERSION"
+    rm /tmp/Python-"$PYTHONVERSION".tar.xz
+    echo "Done"
+  fi
+fi
 echo "Stopping Home Assistant."
 systemctl stop [email protected]
 
 echo "Backing up previous virutal enviorment."
-mv /srv/homeassistant /srv/homeassistant_"$currentpython"
+mv /srv/homeassistant /srv/homeassistant_"$hapyversion"
 
 echo "Creating new virutal environment using Python $PYTHONVERSION"
 python"${PYTHONVERSION:: -2}" -m venv /srv/homeassistant
-mv /srv/homeassistant_"$currentpython"/hassbian /srv/homeassistant/hassbian
+mv /srv/homeassistant_"$hapyversion"/hassbian /srv/homeassistant/hassbian
 chown homeassistant:homeassistant -R /srv/homeassistant
 apt install python3-pip python3-dev
 pip"${PYTHONVERSION:: -2}" install --upgrade virtualenv
@@ -79,7 +64,7 @@ pip3 install --upgrade setuptools wheel
 pip3 install --upgrade homeassistant
 deactivate
 EOF
-mv /home/homeassistant/.homeassistant/deps /home/homeassistant/.homeassistant/deps_"$currentpython"
+mv /home/homeassistant/.homeassistant/deps /home/homeassistant/.homeassistant/deps_"$hapyversion"
 
 echo "Starting Home Assistant."
 systemctl start [email protected]
@@ -102,7 +87,7 @@ else
   echo -e "\\e[31mReverting..."
   systemctl stop [email protected]
   rm -R /srv/homeassistant
-  mv /srv/homeassistant_"$currentpython" /srv/homeassistant
+  mv /srv/homeassistant_"$hapyversion" /srv/homeassistant
   systemctl start [email protected]
   echo
   return 1

package/usr/local/bin/hassbian-config

@@ -49,6 +49,25 @@ function get-all-suite-installers {
   return 0
 }
 
+function currenthapyversion {
+# After you call this function use "$CURRENTHAPYVERSION" to get the value
+CURRENTHAPYVERSION=$(sudo -u homeassistant -H /bin/bash << EOF | awk -F ' ' '{print $NF}'
+source /srv/homeassistant/bin/activate
+python -V
+EOF
+)
+echo "$version"
+}
+
+function currenthaversion {
+# After you call this function use "$CURRENTHAVERSION" to get the value
+CURRENTHAVERSION=$(sudo -u homeassistant -H /bin/bash << EOF | awk -F ' ' '{print $NF}'
+source /srv/homeassistant/bin/activate
+hass --version
+EOF
+)
+}
+
 function show-suites {
   printf "This is a list over all suites in hassbian-config\\n"
   printf "If a \\e[1msuite\\e[0m has \\e[32mgreen color\\e[0m in the name, you have already installed it.\\n"