Merge a877ab0 into 46540a9

CartoDB · Dec 9, 2017 · 82850c7 · 82850c7
2 parents 46540a9 + a877ab0
commit 82850c7
Show file tree

Hide file tree

Showing 71 changed files with 58 additions and 19,551 deletions.
diff --git a/cartoframes/styling.py b/cartoframes/styling.py
@@ -1,4 +1,4 @@
-"""Styling module that exposes CARTOColor schemes. Read more about CARTOColor
+"""Styling module that exposes CARTOColors schemes. Read more about CARTOColors
 in its `GitHub repository <https://github.com/Carto-color/>`__.
 
 .. image:: https://cloud.githubusercontent.com/assets/1566273/21021002/fc9df60e-bd33-11e6-9438-d67951a7a9bf.png
@@ -82,162 +82,162 @@ def scheme(name, bins, bin_method):
     }
 
 
-# Get methods for CARTOColor schemes
+# Get methods for CARTOColors schemes
 def burg(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Burg quantitative scheme"""
+    """CARTOColors Burg quantitative scheme"""
     return scheme('Burg', bins, bin_method)
 
 
 def burgYl(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor BurgYl quantitative scheme"""
+    """CARTOColors BurgYl quantitative scheme"""
     return scheme('BurgYl', bins, bin_method)
 
 
 def redOr(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor RedOr quantitative scheme"""
+    """CARTOColors RedOr quantitative scheme"""
     return scheme('RedOr', bins, bin_method)
 
 
 def orYel(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor OrYel quantitative scheme"""
+    """CARTOColors OrYel quantitative scheme"""
     return scheme('OrYel', bins, bin_method)
 
 
 def peach(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Peach quantitative scheme"""
+    """CARTOColors Peach quantitative scheme"""
     return scheme('Peach', bins, bin_method)
 
 
 def pinkYl(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor PinkYl quantitative scheme"""
+    """CARTOColors PinkYl quantitative scheme"""
     return scheme('PinkYl', bins, bin_method)
 
 
 def mint(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Mint quantitative scheme"""
+    """CARTOColors Mint quantitative scheme"""
     return scheme('Mint', bins, bin_method)
 
 
 def bluGrn(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor BluGrn quantitative scheme"""
+    """CARTOColors BluGrn quantitative scheme"""
     return scheme('BluGrn', bins, bin_method)
 
 
 def darkMint(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor DarkMint quantitative scheme"""
+    """CARTOColors DarkMint quantitative scheme"""
     return scheme('DarkMint', bins, bin_method)
 
 
 def emrld(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Emrld quantitative scheme"""
+    """CARTOColors Emrld quantitative scheme"""
     return scheme('Emrld', bins, bin_method)
 
 
 def bluYl(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor BluYl quantitative scheme"""
+    """CARTOColors BluYl quantitative scheme"""
     return scheme('BluYl', bins, bin_method)
 
 
 def teal(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Teal quantitative scheme"""
+    """CARTOColors Teal quantitative scheme"""
     return scheme('Teal', bins, bin_method)
 
 
 def tealGrn(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor TealGrn quantitative scheme"""
+    """CARTOColors TealGrn quantitative scheme"""
     return scheme('TealGrn', bins, bin_method)
 
 
 def purp(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Purp quantitative scheme"""
+    """CARTOColors Purp quantitative scheme"""
     return scheme('Purp', bins, bin_method)
 
 
 def purpOr(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor PurpOr quantitative scheme"""
+    """CARTOColors PurpOr quantitative scheme"""
     return scheme('PurpOr', bins, bin_method)
 
 
 def sunset(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Sunset quantitative scheme"""
+    """CARTOColors Sunset quantitative scheme"""
     return scheme('Sunset', bins, bin_method)
 
 
 def magenta(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Magenta quantitative scheme"""
+    """CARTOColors Magenta quantitative scheme"""
     return scheme('Magenta', bins, bin_method)
 
 
 def sunsetDark(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor SunsetDark quantitative scheme"""
+    """CARTOColors SunsetDark quantitative scheme"""
     return scheme('SunsetDark', bins, bin_method)
 
 
 def brwnYl(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor BrwnYl quantitative scheme"""
+    """CARTOColors BrwnYl quantitative scheme"""
     return scheme('BrwnYl', bins, bin_method)
 
 
 def armyRose(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor ArmyRose divergent quantitative scheme"""
+    """CARTOColors ArmyRose divergent quantitative scheme"""
     return scheme('ArmyRose', bins, bin_method)
 
 
 def fall(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Fall divergent quantitative scheme"""
+    """CARTOColors Fall divergent quantitative scheme"""
     return scheme('Fall', bins, bin_method)
 
 
 def geyser(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Geyser divergent quantitative scheme"""
+    """CARTOColors Geyser divergent quantitative scheme"""
     return scheme('Geyser', bins, bin_method)
 
 
 def temps(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Temps divergent quantitative scheme"""
+    """CARTOColors Temps divergent quantitative scheme"""
     return scheme('Temps', bins, bin_method)
 
 
 def tealRose(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor TealRose divergent quantitative scheme"""
+    """CARTOColors TealRose divergent quantitative scheme"""
     return scheme('TealRose', bins, bin_method)
 
 
 def tropic(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Tropic divergent quantitative scheme"""
+    """CARTOColors Tropic divergent quantitative scheme"""
     return scheme('Tropic', bins, bin_method)
 
 
 def earth(bins, bin_method=BinMethod.quantiles):
-    """CARTOColor Earth divergent quantitative scheme"""
+    """CARTOColors Earth divergent quantitative scheme"""
     return scheme('Earth', bins, bin_method)
 
 
 def antique(bins, bin_method=BinMethod.category):
-    """CARTOColor Antique qualitative scheme"""
+    """CARTOColors Antique qualitative scheme"""
     return scheme('Antique', bins, bin_method)
 
 
 def bold(bins, bin_method=BinMethod.category):
-    """CARTOColor Bold qualitative scheme"""
+    """CARTOColors Bold qualitative scheme"""
     return scheme('Bold', bins, bin_method)
 
 
 def pastel(bins, bin_method=BinMethod.category):
-    """CARTOColor Pastel qualitative scheme"""
+    """CARTOColors Pastel qualitative scheme"""
     return scheme('Pastel', bins, bin_method)
 
 
 def prism(bins, bin_method=BinMethod.category):
-    """CARTOColor Prism qualitative scheme"""
+    """CARTOColors Prism qualitative scheme"""
     return scheme('Prism', bins, bin_method)
 
 
 def safe(bins, bin_method=BinMethod.category):
-    """CARTOColor Safe qualitative scheme"""
+    """CARTOColors Safe qualitative scheme"""
     return scheme('Safe', bins, bin_method)
 
 
 def vivid(bins, bin_method=BinMethod.category):
-    """CARTOColor Vivid qualitative scheme"""
+    """CARTOColors Vivid qualitative scheme"""
     return scheme('Vivid', bins, bin_method)
diff --git a/docs/404.html b/docs/404.html
@@ -4,10 +4,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>cartoframes documentation</title>
-    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
-    <link rel="index" title="Index" href="genindex.html" />
-    <link rel="search" title="Search" href="search.html" />
-    <link rel="stylesheet" href="_static/custom.css" type="text/css" />
+    <link rel="stylesheet" href="css/alabaster.css" type="text/css" />
     <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
   </head>
   <body>
@@ -18,7 +15,7 @@
             <div class="section" id="cartoframes-package">
               <h1>CARTOframes documentation has moved!</h1>
               <div class="section" id="submodules">
-                <p>Find current documentation here: <a href="https://cartoframes.readthedocs.io/">https://cartoframes.readthedocs.io/</a></p>
+                <p>Find current documentation at <a href="https://cartoframes.readthedocs.io">https://cartoframes.readthedocs.io</a></p>
               </div>
             </div>
           </div>

diff --git a/docs/_sources/cartoframes.context.rst.txt b/docs/_sources/cartoframes.context.rst.txt
diff --git a/docs/_sources/cartoframes.credentials.rst.txt b/docs/_sources/cartoframes.credentials.rst.txt
diff --git a/docs/_sources/cartoframes.dataobs.rst.txt b/docs/_sources/cartoframes.dataobs.rst.txt
diff --git a/docs/_sources/cartoframes.layer.rst.txt b/docs/_sources/cartoframes.layer.rst.txt
diff --git a/docs/_sources/cartoframes.maps.rst.txt b/docs/_sources/cartoframes.maps.rst.txt
diff --git a/docs/_sources/cartoframes.rst.txt b/docs/_sources/cartoframes.rst.txt
diff --git a/docs/_sources/cartoframes.styling.rst.txt b/docs/_sources/cartoframes.styling.rst.txt
diff --git a/docs/_sources/cartoframes.utils.rst.txt b/docs/_sources/cartoframes.utils.rst.txt
diff --git a/docs/_sources/index.rst.txt b/docs/_sources/index.rst.txt
diff --git a/docs/_sources/modules.rst.txt b/docs/_sources/modules.rst.txt
diff --git a/docs/_static/ajax-loader.gif b/docs/_static/ajax-loader.gif