Merge branch 'common-diffpy-patches'

Author: pavoljuhas

.gitattributes

@@ -5,3 +5,4 @@
 /devutils  export-ignore
 /doc  export-ignore
 .gitarchive.cfg  export-subst
+*.bat  text eol=crlf

.travis.yml

@@ -1,6 +1,3 @@
-# Use container-based travis workers
-sudo: false
-
 language: generic
 
 os:
@@ -46,7 +43,7 @@ before_install:
         MYPIP=pip3;
         MYPIPFLAGS="--user";
     fi
-  - MYMCREPO=https://repo.continuum.io/miniconda
+  - MYMCREPO=https://repo.anaconda.com/miniconda
   - case ${TRAVIS_OS_NAME} in
     linux)
         MYMCBUNDLE=Miniconda3-latest-Linux-x86_64.sh ;;
@@ -68,7 +65,7 @@ before_install:
   - $NOMC || popd
   - $NOMC || source ~/mc/bin/activate base
   - $NOMC || conda update --yes conda
-  - $NOMC || conda install --yes conda-build jinja2
+  - $NOMC || conda install --yes conda-build conda-verify jinja2
   - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
 
   - $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?

README.rst

@@ -1,8 +1,8 @@
 .. image:: https://travis-ci.org/diffpy/diffpy.utils.svg?branch=master
    :target: https://travis-ci.org/diffpy/diffpy.utils
 
-.. image:: http://codecov.io/github/diffpy/diffpy.utils/coverage.svg?branch=master
-   :target: http://codecov.io/github/diffpy/diffpy.utils?branch=master
+.. image:: https://codecov.io/gh/diffpy/diffpy.utils/branch/master/graph/badge.svg
+  :target: https://codecov.io/gh/diffpy/diffpy.utils
 
 
 diffpy.utils

setup.py

@@ -76,6 +76,9 @@ def getversioncfg():
 
 versiondata = getversioncfg()
 
+with open(os.path.join(MYDIR, 'README.rst')) as fp:
+    long_description = fp.read()
+
 # define distribution
 setup_args = dict(
     name = "diffpy.utils",
@@ -90,6 +93,8 @@ def getversioncfg():
     maintainer = 'Pavol Juhas',
     maintainer_email = '[email protected]',
     description = "Shared utilities for diffpy packages.",
+    long_description = long_description,
+    long_description_content_type = 'text/x-rst',
     license = 'BSD-style license',
     url = "https://github.com/diffpy/diffpy.utils/",
     keywords = "text data parsers wx grid",