From 9b401a224a5dc55b5193fbfa8f306788049e691a Mon Sep 17 00:00:00 2001 From: Adrian Price-Whelan Date: Mon, 9 Apr 2018 10:08:44 -0400 Subject: [PATCH 1/3] use cat not more --- tutorials/notebooks/vo/conesearch.ipynb | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tutorials/notebooks/vo/conesearch.ipynb b/tutorials/notebooks/vo/conesearch.ipynb index 64734a8a3..9b264e967 100644 --- a/tutorials/notebooks/vo/conesearch.ipynb +++ b/tutorials/notebooks/vo/conesearch.ipynb @@ -19,9 +19,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "# Python standard library\n", @@ -125,9 +123,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "result_tab.write('my_result.tex', format='ascii.latex')" @@ -141,7 +137,7 @@ "source": [ "# Now use your favorite text editor to open the my_result.tex file.\n", "# For example:\n", - "!more my_result.tex" + "!cat my_result.tex" ] }, { @@ -155,9 +151,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "# Due to the unpredictability of external services,\n", @@ -320,9 +314,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "with warnings.catch_warnings():\n", @@ -482,7 +474,7 @@ "published": false }, "kernelspec": { - "display_name": "Python 3", + "display_name": "Python [default]", "language": "python", "name": "python3" }, @@ -496,7 +488,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.3" + "version": "3.6.4" } }, "nbformat": 4, From 9d85fcab8499bbb97e31774a00403d0cc1019746 Mon Sep 17 00:00:00 2001 From: Adrian Price-Whelan Date: Tue, 8 May 2018 15:16:46 -0400 Subject: [PATCH 2/3] fix vizier url --- tutorials/notebooks/vo/conesearch.ipynb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tutorials/notebooks/vo/conesearch.ipynb b/tutorials/notebooks/vo/conesearch.ipynb index 9b264e967..99f85ba97 100644 --- a/tutorials/notebooks/vo/conesearch.ipynb +++ b/tutorials/notebooks/vo/conesearch.ipynb @@ -338,7 +338,8 @@ "metadata": {}, "outputs": [], "source": [ - "my_favorite_result = all_results['http://vizier.u-strasbg.fr/viz-bin/votable/-A?-out.all&-source=I/220/out&']\n", + "url = list(all_results.keys())[0]\n", + "my_favorite_result = all_results[url]\n", "print(my_favorite_result.array.data.dtype.names)\n", "print(my_favorite_result.array.data)" ] From 837617c8ab59134ed70b6ae8711bf94716ae5735 Mon Sep 17 00:00:00 2001 From: Adrian Price-Whelan Date: Tue, 8 May 2018 15:22:36 -0400 Subject: [PATCH 3/3] back to hard-coding URL --- tutorials/notebooks/vo/conesearch.ipynb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tutorials/notebooks/vo/conesearch.ipynb b/tutorials/notebooks/vo/conesearch.ipynb index 99f85ba97..b0a4e1729 100644 --- a/tutorials/notebooks/vo/conesearch.ipynb +++ b/tutorials/notebooks/vo/conesearch.ipynb @@ -338,8 +338,7 @@ "metadata": {}, "outputs": [], "source": [ - "url = list(all_results.keys())[0]\n", - "my_favorite_result = all_results[url]\n", + "my_favorite_result = all_results['http://vizier.u-strasbg.fr/viz-bin/conesearch/I/220/out?']\n", "print(my_favorite_result.array.data.dtype.names)\n", "print(my_favorite_result.array.data)" ]