Merge branch 'dev'

# Conflicts: # setup.py
BrechtBa · Nov 8, 2016 · 7d6a981 · 7d6a981
2 parents 1647ae6 + 595a979
commit 7d6a981
Show file tree

Hide file tree

Showing 50 changed files with 2,897 additions and 1,942 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,5 @@
 include README.md
 include LICENSE
-include examples/example.py
+include examples/example.py
+include plottools/cs_blank.svg
+include plottools/cm/cm_blank.svg
diff --git a/README.rst b/README.rst
@@ -2,3 +2,15 @@ plottools
 =========
 
 A package with usefull tools for plotting with matplotlib
+
+
+Installation
+------------
+.. code-block::
+    
+    pip install plottools
+    
+    
+Documentation
+-------------
+Some documentation is available on `pythonhosted <http://pythonhosted.org/plottools/>`_.
diff --git a/doc/.gitignore b/doc/.gitignore
@@ -0,0 +1,2 @@
+build
+source/generated
diff --git a/doc/source/cm.rst b/doc/source/cm.rst
@@ -0,0 +1,7 @@
+cm
+==
+.. toctree::
+    :maxdepth: 3
+
+Some additional color maps 
+