Merge branch 'pr-590' into 2.5.0

Author: dhoomakethu

.travis.yml

@@ -20,11 +20,12 @@ before_install:
 
 install:
 #  - scripts/travis.sh pip install pip-accel
-  - if [ $TRAVIS_OS_NAME = osx ]; then scripts/travis.sh pip install -U "\"setuptools<45"\"; else pip install -U setuptools --upgrade ; fi
+  - if [ $TRAVIS_OS_NAME = osx ]; then scripts/travis.sh pip install -U pip "\"setuptools<45"\"; else pip install -U pip setuptools --upgrade ; fi
   - scripts/travis.sh pip install coveralls
   - scripts/travis.sh pip install --requirement=requirements-checks.txt
   - scripts/travis.sh pip install --requirement=requirements-tests.txt
-  - scripts/travis.sh LC_ALL=C pip install .
+  - scripts/travis.sh LC_ALL=C pip install --upgrade .
+  - scripts/travis.sh pip freeze --all
 script:
 #  - scripts/travis.sh make check
   - scripts/travis.sh make test