Merge branch 'common-diffpy-patches'

Author: pavoljuhas

.travis.yml

@@ -38,7 +38,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 ;;
@@ -60,7 +60,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
   - $NOMC || conda config --add channels diffpy
 

README.rst

@@ -2,7 +2,7 @@
    :target: https://travis-ci.org/diffpy/diffpy.srfit
 
 .. image:: https://codecov.io/gh/diffpy/diffpy.srfit/branch/master/graph/badge.svg
-   :target: https://codecov.io/gh/diffpy/diffpy.srfit/branch/master
+   :target: https://codecov.io/gh/diffpy/diffpy.srfit
 
 
 diffpy.srfit

setup.py

@@ -77,6 +77,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.srfit",
@@ -92,6 +95,8 @@ def getversioncfg():
     maintainer = "Pavol Juhas",
     maintainer_email = "[email protected]",
     description = "SrFit - Structure refinement from diffraction data",
+    long_description = long_description,
+    long_description_content_type = 'text/x-rst',
     license = 'BSD-style license',
     url = "https://github.com/diffpy/diffpy.srfit",
     keywords = "optimization constraints restraints structure refinement complex modeling",