Merge pull request #12 from dragonyanglong/update_doc

DOC: update conda-forge installation instruction

Author: dragonyanglong

CHANGELOG.md

@@ -15,8 +15,9 @@ Notable differences from version 1.2.
 ### Removed
 
 - Remove the support for Python 3.5, 3.6.
-
+ 
 ### Fixed
 
--  Patch variable to avoid naming problems and Xcode collision on MacOS & Linux.
--  Fix g++ w/ambiguous isnan on Linux.
+- Patch variable to avoid naming problems and Xcode collision on MacOS & Linux.
+- Fix g++ w/ambiguous isnan on Linux.
+- Fix the PY_SSIZE_T_CLEAN macro for py3.10.

README.rst

@@ -59,10 +59,9 @@ INSTALLATION
 ------------------------------------------------------------------------
 
 The preferred method is to use Anaconda Python and install from the
-"diffpy" channel of Anaconda packages ::
+"conda-forge" channel of Anaconda packages ::
 
-   conda config --add channels diffpy
-   conda install diffpy.pdffit2
+   conda install -c conda-forge diffpy.pdffit2
 
 If you don't use Anaconda or prefer to install from sources, make
 sure the required software is in place and run ::

setup.py

@@ -18,7 +18,7 @@
 
 # Use this version when git data are not available, like in git zip archive.
 # Update when tagging a new release.
-FALLBACK_VERSION = '1.4.0'
+FALLBACK_VERSION = '1.4.1'
 
 # determine if we run with Python 3.
 PY3 = (sys.version_info[0] == 3)