Merge branch 'common-diffpy-patches'

Author: pavoljuhas

.travis.yml

@@ -27,6 +27,7 @@ branches:
 
 before_install:
   - MYNAME=libobjcryst
+  - MYCOMMIT="$(git rev-parse HEAD)"
     # travis virtual hosts have 2 cores as per https://goo.gl/DQy4oW
   - MYNCPU=2
   - umask 022
@@ -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 $MYCXXCOMPILER
@@ -106,8 +107,8 @@ install:
   - MYLIB="${MYPREFIX}/lib"
   - MYVERSION="${MYINCLUDE}/ObjCryst/version.h"
   - MYGIT_REV=$(grep '^#define LIBOBJCRYST_GIT_COMMIT' "$MYVERSION" | cut -d '"' -f 2)
-  - 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
 

README.md

@@ -35,7 +35,7 @@ sudo apt-get install build-essential scons libboost-dev
 ```
 
 libobjcryst is also available as a pre-compiled package for
-[Anaconda Python](https://www.continuum.io/downloads) and it
+[Anaconda Python](https://www.anaconda.com/download) and it
 gets automatically installed together with pyobjcryst for
 Anaconda.
 

site_scons/gitarchive.cfg

@@ -1,3 +1,3 @@
 commit = $Format:%H$
-date = $Format:%ai$
+date = $Format:%ci$
 refnames = $Format:%D$

site_scons/libobjcrystbuildutils.py

@@ -34,7 +34,7 @@ def gitinfo():
     if proc.wait():
         _cached_gitinfo = {}
         return gitinfo()
-    proc = Popen(['git', 'log', '-1', '--format=%H %ai'], **kw)
+    proc = Popen(['git', 'log', '-1', '--format=%H %ci'], **kw)
     glog = proc.stdout.read()
     words = desc.strip().split('-')
     vtag = words[0].lstrip('v')