Merge branch 'master' into dynamic

.travis.yml

@@ -26,7 +26,7 @@ install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION nose numpy=1.9.3 bokeh pandas scipy jupyter ipython matplotlib param
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION nose numpy=1.9.1 matplotlib bokeh pandas scipy jupyter ipython param freetype=2.5.2
   - source activate test-environment
   - python setup.py install
   - pip install git+git://github.com/ioam/param.git

doc/Tutorials/Pandas_Conversion.ipynb

@@ -140,24 +140,6 @@
     "HTML(df.reset_index().to_html())"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "For now though, the a, b, and c columns is all we'll need. To confirm the dataframe was converted correctly we can call the `.info` method on Table:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
-   "outputs": [],
-   "source": [
-    "example_table.info"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -267,13 +249,7 @@
    },
    "outputs": [],
    "source": [
-    "from io import BytesIO\n",
-    "try:\n",
-    "    from urllib2 import urlopen, Request\n",
-    "except:\n",
-    "    from urllib.request import urlopen, Request\n",
-    "macro_csv=BytesIO(urlopen('http://ioam.github.com/holoviews/Tutorials/macro.csv').read())\n",
-    "macro_df = pd.read_csv(macro_csv, '\\t')"
+    "macro_df = pd.read_csv('http://ioam.github.com/holoviews/Tutorials/macro.csv', '\\t')"
    ]
   },
   {

doc/Tutorials/Sampling_Data.ipynb

@@ -274,7 +274,7 @@
    "outputs": [],
    "source": [
     "raster = hv.Raster(np.random.rand(3, 3))\n",
-    "raster + hv.Points(raster.table().keys())[-1:3, -1:3] + raster.table()"
+    "raster + hv.Points(raster)[-1:3, -1:3] + raster.table()"
    ]
   },
   {
@@ -316,7 +316,7 @@
    "source": [
     "extents = (0, 0, 3, 3)\n",
     "img = hv.Image(np.random.rand(3, 3), bounds=extents)\n",
-    "img + hv.Points(img.table().keys(), extents=extents) + img.table()"
+    "img + hv.Points(img, extents=extents) + img.table()"
    ]
   },
   {
@@ -462,7 +462,7 @@
     "extents = (0, 0, 10, 10)\n",
     "img = hv.Image(np.random.rand(10, 10), bounds=extents)\n",
     "img_coords = hv.Points(img.table(), extents=extents)\n",
-    "img + img * img_coords * hv.Points([img.closest((5,5))])(style=dict(color='r')) + img.sample([(5, 5)])"
+    "img + img * img_coords * hv.Points([img.closest([(5,5)])])(style=dict(color='r')) + img.sample([(5, 5)])"
    ]
   },
   {
@@ -481,7 +481,7 @@
    "outputs": [],
    "source": [
     "sampled = img.sample(y=5)\n",
-    "img + img * img_coords * hv.Points(zip(sampled.table().keys(), [img.closest((5,5))[1]]*10)) + sampled"
+    "img + img * img_coords * hv.Points(zip(sampled['x'], [img.closest(y=5)]*10)) + sampled"
    ]
   },
   {
@@ -610,8 +610,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": false,
-    "scrolled": true
+    "collapsed": false
    },
    "outputs": [],
    "source": [

doc/Tutorials/Showcase.ipynb

@@ -246,7 +246,7 @@
    "source": [
     "sample_pos = (0,0.25)\n",
     "annotated = circular_wave * hv.Points([sample_pos])\n",
-    "sample = circular_wave.sample(samples=[sample_pos]).reindex().to.curve('Phase', 'Amplitude')\n",
+    "sample = circular_wave.sample(samples=[sample_pos]).to.curve('Phase', 'Amplitude', ['Frequency'])\n",
     "annotated + sample"
    ]
   },

holoviews/core/__init__.py

@@ -1,4 +1,5 @@
 from .boundingregion import *  # pyflakes:ignore (API import)
+from .data import *            # pyflakes:ignore (API import)
 from .dimension import *       # pyflakes:ignore (API import)
 from .element import *         # pyflakes:ignore (API import)
 from .layout import *          # pyflakes:ignore (API import)