Merge branch 'common-diffpy-patches'.

Author: pavoljuhas

.coveragerc

@@ -6,11 +6,13 @@ exclude_lines =
     ## Have to re-enable the standard pragma
     pragma: no cover
     ## Don't complain if tests don't hit defensive assertion code:
-    # raise AssertionError
-    # raise NotImplementedError
+    raise AssertionError
+    raise NotImplementedError
+    ^[ ]*assert False
 
     ## Don't complain if non-runnable code isn't run:
     ^[ ]{4}unittest.main()
+    if __name__ == .__main__.:
 
 
 [run]

.travis.yml

@@ -84,7 +84,7 @@ before_install:
   - $NOBREW || brew install scons
   - $NOBREW || brew install python3
   - $NOBREW || brew install boost-python --with-python3
-  - $NOBREW || brew tap homebrew/python
+  - $NOBREW || brew install gcc || brew link --overwrite gcc
   - $NOBREW || brew install numpy --without-python --with-python3
 
   - $NOSYS || devutils/makesdist
@@ -107,7 +107,7 @@ install:
   - $NOSYS || $MYPIP install $MYPIPFLAGS "${MYTARBUNDLE}"
 
   - cd ${MYRUNDIR}
-  - MYGIT_REV=$($MYPYTHON -c "import ${MYNAME}.version as v; print(v.__gitsha__)")
+  - MYGIT_REV=$($MYPYTHON -c "import ${MYNAME}.version as v; print(v.__git_commit__)")
   - if [[ "${TRAVIS_COMMIT}" != "${MYGIT_REV}" ]]; then
         echo "Version mismatch ${TRAVIS_COMMIT} vs ${MYGIT_REV}.";
         exit 1;

src/pyobjcryst/version.py

@@ -13,31 +13,46 @@
 #
 ##############################################################################
 
+"""
+Definition of __version__, __date__, __timestamp__, __git_commit__,
+libobjcryst_version_info.
 
-"""Definition of __version__, __date__, __gitsha__, libobjcryst_version_info.
+Notes
+-----
+Variable `__gitsha__` is deprecated as of version 2.1.
+Use `__git_commit__` instead.
 """
 
+__all__ = ['__date__', '__git_commit__', '__timestamp__', '__version__',
+           'libobjcryst_version_info']
+
+import os.path
+
 from pkg_resources import resource_filename
 
-import sys
-if sys.version_info[0] >= 3:
-    from configparser import RawConfigParser
-else:
-    from ConfigParser import RawConfigParser
-del sys
 
 # obtain version information from the version.cfg file
-cp = RawConfigParser(dict(version='', date='', commit='', timestamp=0))
-if not cp.read(resource_filename(__name__, 'version.cfg')):
+cp = dict(version='', date='', commit='', timestamp='0')
+fcfg = resource_filename(__name__, 'version.cfg')
+if not os.path.isfile(fcfg):    # pragma: no cover
     from warnings import warn
     warn('Package metadata not found, execute "./setup.py egg_info".')
+    fcfg = os.devnull
+with open(fcfg) as fp:
+    kwords = [[w.strip() for w in line.split(' = ', 1)]
+              for line in fp if line[:1].isalpha() and ' = ' in line]
+assert all(w[0] in cp for w in kwords), "received unrecognized keyword"
+cp.update(kwords)
+
+__version__ = cp['version']
+__date__ = cp['date']
+__git_commit__ = cp['commit']
+__timestamp__ = int(cp['timestamp'])
 
-__version__ = cp.get('DEFAULT', 'version')
-__date__ = cp.get('DEFAULT', 'date')
-__gitsha__ = cp.get('DEFAULT', 'commit')
-__timestamp__ = cp.getint('DEFAULT', 'timestamp')
+# TODO remove deprecated __gitsha__ in version 2.2.
+__gitsha__ = __git_commit__
 
-del cp
+del cp, fcfg, fp, kwords
 
 # version information on the active libObjCryst library ----------------------