DOC: update instructions for installation.

Author: dragonyanglong

README.rst

@@ -57,17 +57,20 @@ 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.pdfgui
+   conda install -c conda-forge diffpy.pdfgui
 
 PDFgui can be then started from a terminal ("Anaconda Prompt" on
 Windows) by executing the "pdfgui" program.  An alternative
 method on Windows is to start PDFgui through the DiffPy start menu.
 
 If you don't use Anaconda or prefer to install from sources, make
-sure the required software is all in place and run ::
+sure the required software is all in place ::
+
+   pip install wxpython==4.0.7 diffpy.utils diffpy.pdffit2 matplotlib
+
+Then you are ready to install diffpy.pdfgui ::
 
    python setup.py install
 
@@ -92,7 +95,6 @@ the latest version as follows ::
 
    easy_install --upgrade diffpy.pdfgui
 
-
 Other software
 ````````````````````````````````````````````````````````````````````````
 

setup.py

@@ -15,7 +15,7 @@
 
 # Use this version when git data are not available, like in git zip archive.
 # Update when tagging a new release.
-FALLBACK_VERSION = '1.2.0'
+FALLBACK_VERSION = '1.4.0'
 
 # determine if we run with Python 3.
 PY3 = (sys.version_info[0] == 3)
@@ -29,7 +29,7 @@
 def gitinfo():
     from subprocess import Popen, PIPE
     kw = dict(stdout=PIPE, cwd=MYDIR, universal_newlines=True)
-    proc = Popen(['git', 'describe', '--match=v[[:digit:]]*'], **kw)
+    proc = Popen(['git', 'describe', '--tags', '--match=v[[:digit:]]*'], **kw)
     desc = proc.stdout.read()
     proc = Popen(['git', 'log', '-1', '--format=%H %ct %ci'], **kw)
     glog = proc.stdout.read()