Merge branch 'common-diffpy-patches'

Author: pavoljuhas

.coveragerc

@@ -11,6 +11,7 @@ exclude_lines =
     ^[ ]*assert False
 
     ## Don't complain if non-runnable code isn't run:
+    ^[ ]*@unittest.skip\b
     ^[ ]{4}unittest.main()
     if __name__ == .__main__.:
 

.gitarchive.cfg

@@ -1,5 +1,5 @@
 [DEFAULT]
 commit = $Format:%H$
-date = $Format:%ai$
-timestamp = $Format:%at$
+date = $Format:%ci$
+timestamp = $Format:%ct$
 refnames = $Format:%D$

.travis.yml

@@ -34,6 +34,7 @@ addons:
 
 before_install:
   - MYNAME=diffpy.pdfgui
+  - MYCOMMIT="$(git rev-parse HEAD)"
   - umask 022
   - git fetch origin --tags
   - if ${MYUSEMC}; then
@@ -62,7 +63,7 @@ before_install:
   - $NOMC || wget --timestamping ${MYMCREPO}/${MYMCBUNDLE}
   - $NOMC || test -x ~/mc/bin/conda || bash ${MYMCBUNDLE} -b -f -p ~/mc
   - $NOMC || popd
-  - $NOMC || source ~/mc/bin/activate root
+  - $NOMC || source ~/mc/bin/activate base
   - $NOMC || conda update --yes conda
   - $NOMC || conda install --yes conda-build jinja2
   - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
@@ -89,8 +90,8 @@ install:
 
   - cd ${MYRUNDIR}
   - MYGIT_REV=$(python -c "import ${MYNAME}.version as v; print(v.__git_commit__)")
-  - if [[ "${TRAVIS_COMMIT}" != "${MYGIT_REV}" ]]; then
-        echo "Version mismatch ${TRAVIS_COMMIT} vs ${MYGIT_REV}.";
+  - if [[ "${MYCOMMIT}" != "${MYGIT_REV}" ]]; then
+        echo "Version mismatch ${MYCOMMIT} vs ${MYGIT_REV}.";
         exit 1;
     fi
 

setup.py

@@ -26,7 +26,7 @@ def gitinfo():
     kw = dict(stdout=PIPE, cwd=MYDIR)
     proc = Popen(['git', 'describe', '--match=v[[:digit:]]*'], **kw)
     desc = proc.stdout.read()
-    proc = Popen(['git', 'log', '-1', '--format=%H %at %ai'], **kw)
+    proc = Popen(['git', 'log', '-1', '--format=%H %ct %ci'], **kw)
     glog = proc.stdout.read()
     rv = {}
     rv['version'] = '.post'.join(desc.strip().split('-')[:2]).lstrip('v')

src/diffpy/pdfgui/tests/__init__.py

@@ -54,8 +54,8 @@ def testsuite(pattern=''):
         return suite_all
     tcases = chain.from_iterable(tsuites)
     for tc in tcases:
-        tcwords = tc.id().rsplit('.', 2)
-        shortname = '.'.join(tcwords[-2:])
+        tcwords = tc.id().split('.')
+        shortname = '.'.join(tcwords[-3:])
         if rx.search(shortname):
             suite.addTest(tc)
     # verify all tests are found for an empty pattern.

src/diffpy/pdfgui/tests/run.py

@@ -21,6 +21,12 @@
 
 if __name__ == '__main__':
     import sys
+    # show warnings by default
+    if not sys.warnoptions:
+        import os, warnings
+        warnings.simplefilter("default")
+        # also affect subprocesses
+        os.environ["PYTHONWARNINGS"] = "default"
     from diffpy.pdfgui.tests import test
     # produce zero exit code for a successful test
     sys.exit(not test().wasSuccessful())