Merge 15cffca into 375d593

CartoDB · Mar 5, 2018 · a8b9fe0 · a8b9fe0
2 parents 375d593 + 15cffca
commit a8b9fe0
Show file tree

Hide file tree

Showing 8 changed files with 972 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -3,8 +3,8 @@ init:
 
 docs:
 	cd docs && make html
-	rm -r docs/_sources/ docs/_static
-	mv -f docs/html/* docs/
+	# rm -r docs/_sources/ docs/_static
+	# mv -f docs/html/* docs/
 
 test:
 	nosetests -v test/

diff --git a/cartoframes/__init__.py b/cartoframes/__init__.py
@@ -1,3 +1,4 @@
+from .analysis import Table, Query, AnalysisTree
 from .context import CartoContext, BatchJobStatus
 from .credentials import Credentials
 from .layer import BaseMap, QueryLayer, Layer