Merge branches 'master' and 'yamlify' of https://github.com/desihub/d…

…esiutil into yamlify Conflicts: doc/changes.rst
desihub · Jun 8, 2016 · 2f21e68 · 2f21e68
2 parents 2f0d340 + dbd7fdb
commit 2f21e68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -69,6 +69,9 @@ matrix:
 #           python: 2.7
 #           env: MAIN_CMD='pep8' SETUP_CMD='--count py/desiutil'
 
+before_install:
+    - curl ipinfo.io
+
 install:
     - if [[ $MAIN_CMD == 'pep8' ]]; then pip install pep8; fi
     - if [[ $SETUP_CMD == 'build_sphinx' ]]; then pip install Sphinx; fi

diff --git a/doc/changes.rst b/doc/changes.rst
@@ -13,6 +13,7 @@ Change Log
 * Add some test coverage in :mod:`desiutil.setup`.
 * Cleaned up documentation of :mod:`desiutil.io` and several other modules.
 * Modified conversion of keys to string in :mod:`desituil.io.yamlify`
+* Log IP address in Travis Tests.
 
 1.4.0 (2016-04-28)
 ------------------