Drop QGIS 2 support

qgis · Nov 14, 2018 · 68f9a41 · 68f9a41
1 parent 4b90f77
commit 68f9a41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 27 deletions.
diff --git a/.docker/qgis_resources/test_runner/qgis_setup.sh b/.docker/qgis_resources/test_runner/qgis_setup.sh
@@ -11,55 +11,35 @@
 # - enable the plugin
 
 PLUGIN_NAME=$1
-CONF_FOLDER="/root/.config/QGIS"
-CONF_FILE="${CONF_FOLDER}/QGIS2.conf"
 CONF_MASTER_FOLDER="/root/.local/share/QGIS/QGIS3/profiles/default/QGIS/"
 CONF_MASTER_FILE="${CONF_MASTER_FOLDER}/QGIS3.ini"
-QGIS_FOLDER="/root/.qgis2"
 
 QGIS_MASTER_FOLDER="/root/.local/share/QGIS/QGIS3/profiles/default"
-PLUGIN_FOLDER="${QGIS_FOLDER}/python/plugins"
 PLUGIN_MASTER_FOLDER="${QGIS_MASTER_FOLDER}/python/plugins"
 
-STARTUP_FOLDER="${QGIS_FOLDER}/python"
 STARTUP_MASTER_FOLDER="/root/.local/share/QGIS/QGIS3/"
 
 # Creates the config file
-mkdir -p $CONF_FOLDER
-if [ -e "$CONF_FILE" ]; then
-    rm -f $CONF_FILE
-fi
-touch $CONF_FILE
-
-
 mkdir -p $CONF_MASTER_FOLDER
 if [ -e "$CONF_MASTER_FILE" ]; then
     rm -f $CONF_MASTER_FILE
 fi
 touch $CONF_MASTER_FILE
 
 # Creates plugin folder
-mkdir -p $PLUGIN_FOLDER
 mkdir -p $PLUGIN_MASTER_FOLDER
 mkdir -p $STARTUP_MASTER_FOLDER
 
 # Install the monkey patches to prevent modal stacktrace on python errors
-cp /usr/bin/qgis_startup.py ${STARTUP_FOLDER}/startup.py
 cp /usr/bin/qgis_startup.py ${STARTUP_MASTER_FOLDER}/startup.py
 
 # Disable tips
-printf "[Qgis]\n" >> $CONF_FILE
-# !!!! Note that on master it is lowercase !!!!
 printf "[qgis]\n" >> $CONF_MASTER_FILE
 SHOW_TIPS=$(qgis --help 2>&1 | head -2 | grep 'QGIS - ' | perl -npe 'chomp; s/QGIS - (\d+)\.(\d+).*/showTips\1\2=false/')
-printf "%s\n\n" "$SHOW_TIPS" >> $CONF_FILE
 printf "%s\n\n" "$SHOW_TIPS" >> $CONF_MASTER_FILE
 
 if [ -n "$PLUGIN_NAME" ]; then
     # Enable plugin
-    printf '[PythonPlugins]\n' >> $CONF_FILE
-    printf "%s=true\n\n" "$PLUGIN_NAME" >> $CONF_FILE
-
     printf '[PythonPlugins]\n' >> $CONF_MASTER_FILE
     printf "%s=true\n\n" "$PLUGIN_NAME" >> $CONF_MASTER_FILE
 fi
@@ -69,16 +49,12 @@ fi
     printf
     "\n[migration]\n"
     "fileVersion=2\n"
-    "firstRunVersionFlag=29900\n"
+    "firstRunVersionFlag=30500\n"
     "settings=true\n\n"
 } >> $CONF_MASTER_FILE
 
 
 # Install the plugin
-if  [ ! -L "${PLUGIN_FOLDER}/${PLUGIN_NAME}" ]; then
-    ln -s "/tests_directory/${PLUGIN_NAME}" "${PLUGIN_FOLDER}"
-    echo "Plugin folder linked in ${PLUGIN_FOLDER}/${PLUGIN_NAME}"
-fi
 if [ ! -d "${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}" ]; then
     ln -s "/tests_directory/${PLUGIN_NAME}" "${PLUGIN_MASTER_FOLDER}"
     echo "Plugin master folder linked in ${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}"

diff --git a/.docker/qgis_resources/test_runner/qgis_startup.py b/.docker/qgis_resources/test_runner/qgis_startup.py
@@ -2,8 +2,8 @@
 Disable QGIS modal error dialog.
 
 This script is meant to be run automatically when QGIS starts.
-Is should be renamed to `startup.py` and placed into ~/.qgis2/python/startup.py
-or  ~/.qgis-dev/python/startup.py or ~/.qgis3/python/startup.py
+Is should be renamed to `startup.py` and placed into
+~/.qgis3/python/startup.py
 
 """
 from qgis import utils