travis-ci: fix packaging-trusty.sh issues

Author: Sarcasm

.travis.yml

@@ -17,7 +17,7 @@ matrix:
   include:
     - python: 3.6
       env: TOXENV=lint,docs
-    - python: 3.6
+    - python: 2.7
       script: ./tests/integration/packaging-trusty.sh
     - python: 3.6
       install: python setup.py install

compdb/cli.py

@@ -427,7 +427,7 @@ def _format_action(self, action):
 
 
 def term_columns():
-    columns = 80
+    columns = 0
 
     try:
         # can happens in tests, when we redirect sys.stdout to a StringIO
@@ -449,7 +449,9 @@ def term_columns():
                                 struct.pack('HHHH', 0, 0, 0, 0)))[1]
             except (ImportError, IOError):
                 pass
-    return columns
+    if columns > 0:
+        return columns
+    return 80
 
 
 def _wrap_paragraphs(text, max_width=None):
@@ -518,7 +520,8 @@ def main(argv=None):
 
         command_description = textwrap.dedent("""
         description:
-        """) + _wrap_paragraphs(command_description, 120)
+        """) + _wrap_paragraphs(
+            command_description, max_width=120)
 
         subparser = subparsers.add_parser(
             command_cls.name,

tests/integration/packaging-trusty.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 
 # This script tests the packaging of compdb on Ubuntu Trusty.
-# It has been made to run on Travis CI and locally on Ubuntu 14.04,
-# or locally inside docker thanks to docker/ubuntu-trusty.sh.
+
+# It has been made to run on Travis CI and inside docker image of Ubuntu 14.04.
+# For the docker image, one can use docker/ubuntu-trusty.sh.
+# At this time it is not recommended to run this locally
+# because files are created in the user home directory.
 # The dependencies can be found in docker/ubuntu-trusty/Dockerfile.
 
 if [[ ! -f compdb/__init__.py ]]; then
@@ -13,6 +16,26 @@ fi
 set -o errexit
 set -o xtrace
 
+# Initial goal for this script was to run in a "pristine" Ubuntu Trusty,
+# with a stock installation of python,
+# unfortunately Travis CI uses isolated virtualenvs:
+# - https://docs.travis-ci.com/user/languages/python/#Travis-CI-Uses-Isolated-virtualenvs
+#
+# This means, one has to accomodate the 'pip install' commands
+# to not use the --user options when run under virtualenv.
+# Doing otherwise, triggers the following error:
+#     $ pip install --user .
+#     Can not perform a '--user' install. User site-packages are not visible in this virtualenv.
+#
+# virtualenv detection logic copied from pip:
+# - https://github.com/pypa/pip/blob/ccd75d4daf7753b6587cffbb1ba52e7dfa5e9915/pip/locations.py#L41-L51
+USER_OPTS=""
+if python -c 'import sys; sys.exit(hasattr(sys, "real_prefix"))' ||
+        python -c 'import sys; sys.exit(sys.prefix != getattr(sys, "base_prefix", sys.prefix))'
+then
+    USER_OPTS="--user"
+fi
+
 # First generate release files to ~/dist
 virtualenv .venv
 source .venv/bin/activate
@@ -25,13 +48,18 @@ rm -r .venv
 
 # Install from source
 mkdir ~/userbase
-PYTHONUSERBASE=~/userbase python setup.py install --user
-PYTHONUSERBASE=~/userbase PATH="$HOME/userbase/bin:$PATH" compdb version
+env PYTHONPATH=$(PYTHONUSERBASE=~/userbase python -m site --user-site) \
+    PYTHONUSERBASE=~/userbase \
+    python setup.py install --user
+env PYTHONPATH=$(PYTHONUSERBASE=~/userbase python -m site --user-site) \
+    PYTHONUSERBASE=~/userbase \
+    PATH="$HOME/userbase/bin:$PATH" \
+    compdb version
 rm -r ~/userbase
 
 # Install from source with pip
 mkdir ~/userbase
-PYTHONUSERBASE=~/userbase pip install --user .
+PYTHONUSERBASE=~/userbase pip install ${USER_OPTS} .
 PYTHONUSERBASE=~/userbase PATH="$HOME/userbase/bin:$PATH" compdb version
 rm -r ~/userbase
 
@@ -48,7 +76,7 @@ rm -r .venv
 
 # Wheel
 mkdir ~/userbase
-PYTHONUSERBASE=~/userbase pip install --user ~/dist/compdb-*.whl
+PYTHONUSERBASE=~/userbase pip install ${USER_OPTS} ~/dist/compdb-*.whl
 PYTHONUSERBASE=~/userbase PATH="$HOME/userbase/bin:$PATH" compdb version
 rm -r ~/userbase
 
@@ -66,7 +94,7 @@ rm -r .venv
 
 # pip install source distribution
 mkdir ~/userbase
-PYTHONUSERBASE=~/userbase pip install --user ~/dist/compdb-*.tar.gz
+PYTHONUSERBASE=~/userbase pip install ${USER_OPTS} ~/dist/compdb-*.tar.gz
 PYTHONUSERBASE=~/userbase PATH="$HOME/userbase/bin:$PATH" compdb version
 rm -r ~/userbase