docker/bionic/Dockerfile

@@ -60,10 +60,6 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
     build-essential libcap-dev tor
     
 
-# locales
-RUN apt-get install -yq --no-install-suggests --no-install-recommends \
-    language-pack-en
-
 # cleanup
 RUN rm -rf /var/lib/apt/lists/*
 

travis2bash.sh

@@ -161,10 +161,8 @@ if [[ "$(declare -p travis_python)" =~ "declare -a" ]]; then
         # strip quotes
         temp="${pv%\"}"
         pv="${temp#\"}"
+        # strip crap
         options=$(echo "$pv"|cut -d_ -f2-)
-        if [ "$options" == "$pv" ]; then
-            unset options
-        fi
         if [[ "$options" == with* ]]; then
             options="--$(echo "$options"|cut -d_ -f2-|tr -- '_' '-')"
         fi
@@ -178,11 +176,7 @@ if [[ "$(declare -p travis_python)" =~ "declare -a" ]]; then
         sudo apt -y install "python$pv" "python${pv}-dev"
         #fi
 
-        if [ -n "$options" ]; then
-            virtualenv_init "$ppath" "$pv" "$options"
-        else
-            virtualenv_init "$ppath" "$pv"
-        fi
+        virtualenv_init "$ppath" "$pv" "$options"
         virtualenv_activate "$pv"
         python_run "$ppath" "$pv"
         deactivate