Use time scale when index has type 'date' or 'datetime'

.travis.yml

@@ -3,9 +3,10 @@ python:
   - "2.7"
   - "3.4"
 before_install:
+  - sudo apt-get update
   - sudo apt-get install -qq gfortran libatlas-base-dev python-numpy
 install:
-  - pip install ipython mock pandas flake8 --use-mirrors
+  - pip install ipython mock pandas flake8 jinja2 --use-mirrors
 script:
   - flake8 --exclude=colors.py,_compat.py vincent tests
   - nosetests

examples/stacked_area_examples.py

@@ -22,31 +22,31 @@
 
 data = Data.from_pandas(price)
 vis.data['table'] = data
-facets = Transform(type='facet', keys=['data.idx'])
-stats = Transform(type='stats', value='data.val')
+facets = Transform(type='facet', groupby=['idx'])
+stats = Transform(type='aggregate', value='val')
 stat_dat = Data(name='stats', source='table', transform=[facets, stats])
 vis.data['stats'] = stat_dat
 
 
 vis.scales['x'] = Scale(name='x', type='time', range='width',
-                        domain=DataRef(data='table', field="data.idx"))
+                        domain=DataRef(data='table', field="idx"))
 vis.scales['y'] = Scale(name='y', range='height', type='linear', nice=True,
                         domain=DataRef(data='stats', field="sum"))
 vis.scales['color'] = Scale(name='color', type='ordinal',
-                            domain=DataRef(data='table', field='data.col'),
+                            domain=DataRef(data='table', field='col'),
                             range='category20')
 vis.axes.extend([Axis(type='x', scale='x'),
                  Axis(type='y', scale='y')])
 
 
-facet = Transform(type='facet', keys=['data.col'])
-stack = Transform(type='stack', point='data.idx', height='data.val')
+facet = Transform(type='facet', groupby=['col'])
+stack = Transform(type='stack', point='idx', height='val')
 transform = MarkRef(data='table',transform=[facet, stack])
-enter_props = PropertySet(x=ValueRef(scale='x', field="data.idx"),
+enter_props = PropertySet(x=ValueRef(scale='x', field="idx"),
                           y=ValueRef(scale='y', field="y"),
                           interpolate=ValueRef(value='monotone'),
                           y2=ValueRef(field='y2', scale='y'),
-                          fill=ValueRef(scale='color', field='data.col'))
+                          fill=ValueRef(scale='color', field='col'))
 mark = Mark(type='group', from_=transform,
             marks=[Mark(type='area',
             properties=MarkProperties(enter=enter_props))])

examples/stacked_bar_examples.py

@@ -27,31 +27,31 @@
 
 data = Data.from_pandas(df)
 vis.data['table'] = data
-facets = Transform(type='facet', keys=['data.idx'])
-stats = Transform(type='stats', value='data.val')
+facets = Transform(type='facet', groupby=['idx'])
+stats = Transform(type='aggregate', value='val')
 stat_dat = Data(name='stats', source='table', transform=[facets, stats])
 vis.data['stats'] = stat_dat
 
 
 vis.scales['x'] = Scale(name='x', type='ordinal', range='width',
-                        domain=DataRef(data='table', field="data.idx"))
+                        domain=DataRef(data='table', field="idx"))
 vis.scales['y'] = Scale(name='y', range='height', type='linear', nice=True,
                         domain=DataRef(data='stats', field="sum"))
 vis.scales['color'] = Scale(name='color', type='ordinal',
-                            domain=DataRef(data='table', field='data.col'),
+                            domain=DataRef(data='table', field='col'),
                             range='category20')
 vis.axes.extend([Axis(type='x', scale='x'),
                  Axis(type='y', scale='y')])
 
 
-facet = Transform(type='facet', keys=['data.col'])
-stack = Transform(type='stack', point='data.idx', height='data.val')
+facet = Transform(type='facet', groupby=['col'])
+stack = Transform(type='stack', point='idx', height='val')
 transform = MarkRef(data='table',transform=[facet, stack])
-enter_props = PropertySet(x=ValueRef(scale='x', field="data.idx"),
+enter_props = PropertySet(x=ValueRef(scale='x', field="idx"),
                           y=ValueRef(scale='y', field="y"),
                           width=ValueRef(scale='x', band=True, offset=-1),
                           y2=ValueRef(field='y2', scale='y'),
-                          fill=ValueRef(scale='color', field='data.col'))
+                          fill=ValueRef(scale='color', field='col'))
 mark = Mark(type='group', from_=transform,
             marks=[Mark(type='rect',
             properties=MarkProperties(enter=enter_props))])