Code / docs cleanup

* Add anaconda.org URL to README
* Fix minor error in README
* Document passing a .py file as COLORMAP, clean up unnecessary comment
* Relocate `__name__ == "__main__"` check to `cli` module

Author: mfisher87

README.rst

@@ -14,7 +14,8 @@ resulting visualizations and use the editor tool `on this website
 <https://bids.github.io/colormap/>`_.
 
 Downloads:
-  https://pypi.python.org/pypi/viscm/
+  * https://pypi.python.org/pypi/viscm/
+  * https://anaconda.org/conda-forge/viscm/
 
 Code and bug tracker:
   https://github.com/matplotlib/viscm
@@ -29,4 +30,4 @@ Dependencies:
   * NumPy
 
 License:
-  MIT, see LICENSE.txt for details.
+  MIT, see `LICENSE <LICENSE>`__ for details.

viscm/cli.py

@@ -2,23 +2,13 @@
 
 import matplotlib.pyplot as plt
 
-from . import gui
+from viscm import gui
 
 
 def cli():
     import argparse
     argv = sys.argv[1:]
 
-    # Usage:
-    #   python -m viscm
-    #   python -m viscm edit
-    #   python -m viscm edit <file.py>
-    #      (file.py must define some appropriate globals)
-    #   python -m viscm view <file.py>
-    #      (file.py must define a global named "test_cm")
-    #   python -m viscm view "matplotlib builtin colormap"
-    #   python -m viscm view --save=foo.png ...
-
     parser = argparse.ArgumentParser(
         prog="python -m viscm",
         description="A colormap tool.",
@@ -30,8 +20,9 @@ def cli():
                         nargs="?")
     parser.add_argument("colormap", metavar="COLORMAP",
                         default=None,
-                        help="A .json file saved from the editor, or "
-                             "the name of a matplotlib builtin colormap",
+                        help="A .json file saved from the editor, a .py file containing"
+                        " a global named `test_cm`, or the name of a matplotlib"
+                        " builtin colormap",
                         nargs="?")
     parser.add_argument("--uniform-space", metavar="SPACE",
                         default="CAM02-UCS",
@@ -109,3 +100,7 @@ def cli():
     signal.signal(signal.SIGINT, signal.SIG_DFL)
 
     app.exec_()
+
+
+if __name__ == "__main__":
+    cli()

viscm/gui.py

@@ -1225,7 +1225,3 @@ def loadviewer(self):
         newwindow.resize(800, 600)
 
         newwindow.show()
-
-
-if __name__ == "__main__":
-    main()