Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1441529
Texto actualizado y cambios de estilo usando talktools.py
htapia Sep 12, 2014
66bea5d
Added notebooks with lesson on GIT and fixed slides in main presentat…
htapia Sep 15, 2014
3978ea2
Merge remote-tracking branch 'origin/master'
htapia Sep 15, 2014
59311ee
Update README.md
htapia Sep 15, 2014
6e73365
Essentials
htapia Sep 19, 2014
4cb2501
Changed ome names, divided main document in two separate parts
htapia Sep 19, 2014
8cd789f
Updated lesson
htapia Sep 22, 2014
2346425
merge with house work
htapia Sep 23, 2014
389a84b
Merge branch 'master' of https://github.com/htapia/lania.ipython
htapia Sep 23, 2014
0e62f48
deleted lib02_esenciales
htapia Sep 23, 2014
f30d5a7
Completed essential 3
htapia Sep 23, 2014
57a9dec
merging branches
htapia Sep 23, 2014
76cd1ec
Renamed and reordered notebooks
htapia Sep 25, 2014
95f875f
notebook with text essentials
htapia Sep 26, 2014
3f4954f
Completed lecture 4 on reading text files
htapia Oct 2, 2014
17ffe9a
Figshare account and sharing an image
htapia Oct 2, 2014
87b0d92
Figshare acct, upload image and added ipynb with this
htapia Oct 2, 2014
df28ee7
Sync notebooks with work machine
htapia Oct 2, 2014
7fb0d55
New organization of notebooks by day
htapia Oct 3, 2014
9d74621
Update README.md
htapia Oct 3, 2014
995a849
Fixed notebooks for Dia1
htapia Oct 3, 2014
b954d00
Merge branch 'master' of https://github.com/htapia/lania.ipython
htapia Oct 3, 2014
de4bc46
Updated content in Dia2
htapia Oct 6, 2014
41e172f
Merge branch 'master' of https://github.com/htapia/lania.ipython
htapia Oct 6, 2014
e59a507
New work on Dia2 completed
htapia Oct 7, 2014
47af1e2
added one more notebook in Dia2
htapia Oct 8, 2014
a8ef187
fixed talktools
htapia Oct 8, 2014
635990e
Finished with first part of data analysis in Dia2
htapia Oct 17, 2014
bb402b8
Almost done with notebooks and organization
htapia Oct 29, 2014
6e5dbd8
Update Readme.md
htapia Oct 30, 2014
98c61e5
Organized files and added gitignores
htapia Oct 30, 2014
c2a7f57
Merge branch 'master' of https://github.com/htapia/lania.ipython
htapia Oct 30, 2014
dcff105
Update gitignore
htapia Oct 30, 2014
6dc8774
Delete .gitignore
htapia Oct 30, 2014
f7d10c4
Update README.md
htapia Oct 30, 2014
09261a4
Update README.md
htapia Oct 30, 2014
ab991aa
Fixed Index links
htapia Oct 30, 2014
b1dbd44
Merge branch 'master' of https://github.com/htapia/lania.ipython
htapia Oct 30, 2014
da5388b
Fechas y actividades actualizadas para 2015
htapia Oct 22, 2015
d9eadda
updated contents and information
htapia Oct 23, 2015
820e5c8
day 2 updates
htapia Oct 26, 2015
14e6edb
name changes in days 1,2
htapia Oct 30, 2015
5dd9f93
new changes for day 2
htapia Oct 30, 2015
8245fe7
games using bokeh
htapia Oct 31, 2015
fcf4353
trying to merge changes
htapia Oct 31, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# IPython Notebooks #
#####################
.ipynb_checkpoints/

# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so

# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip

# Logs and databases #
######################
*.log
*.sql
*.sqlite

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
*~
266 changes: 266 additions & 0 deletions Dia1/Index.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 2,
"metadata": {
"collapsed": false
},
"outputs": [
{
"data": {
"text/html": [
"<link href='http://fonts.googleapis.com/css?family=Alegreya+Sans:100,300,400,500,700,800,900,100italic,300italic,400italic,500italic,700italic,800italic,900italic' rel='stylesheet' type='text/css'>\n",
"<link href='http://fonts.googleapis.com/css?family=Arvo:400,700,400italic' rel='stylesheet' type='text/css'>\n",
"<link href='http://fonts.googleapis.com/css?family=PT+Mono' rel='stylesheet' type='text/css'>\n",
"<link href='http://fonts.googleapis.com/css?family=Shadows+Into+Light' rel='stylesheet' type='text/css'>\n",
"<link href='http://fonts.googleapis.com/css?family=Nixie+One' rel='stylesheet' type='text/css'>\n",
"<style>\n",
"\n",
"@font-face {\n",
" font-family: \"Computer Modern\";\n",
" src: url('http://mirrors.ctan.org/fonts/cm-unicode/fonts/otf/cmunss.otf');\n",
"}\n",
"\n",
"#notebook_panel { /* main background */\n",
" background: rgb(245,245,245);\n",
"}\n",
"\n",
"div.cell { /* set cell width */\n",
" width: 750px;\n",
"}\n",
"\n",
"div #notebook { /* centre the content */\n",
" background: #fff; /* white background for content */\n",
" width: 1000px;\n",
" margin: auto;\n",
" padding-left: 0em;\n",
"}\n",
"\n",
"#notebook li { /* More space between bullet points */\n",
"margin-top:0.8em;\n",
"}\n",
"\n",
"/* draw border around running cells */\n",
"div.cell.border-box-sizing.code_cell.running { \n",
" border: 1px solid #111;\n",
"}\n",
"\n",
"/* Put a solid color box around each cell and its output, visually linking them*/\n",
"div.cell.code_cell {\n",
" background-color: rgb(256,256,256); \n",
" border-radius: 0px; \n",
" padding: 0.5em;\n",
" margin-left:1em;\n",
" margin-top: 1em;\n",
"}\n",
"\n",
"div.text_cell_render{\n",
" font-family: 'Alegreya Sans' sans-serif;\n",
" line-height: 140%;\n",
" font-size: 125%;\n",
" font-weight: 400;\n",
" width:600px;\n",
" margin-left:auto;\n",
" margin-right:auto;\n",
"}\n",
"\n",
"\n",
"/* Formatting for header cells */\n",
".text_cell_render h1 {\n",
" font-family: 'Nixie One', serif;\n",
" font-style:regular;\n",
" font-weight: 400; \n",
" font-size: 45pt;\n",
" line-height: 100%;\n",
" color: rgb(0,51,102);\n",
" margin-bottom: 0.5em;\n",
" margin-top: 0.5em;\n",
" display: block;\n",
"}\t\n",
".text_cell_render h2 {\n",
" font-family: 'Nixie One', serif;\n",
" font-weight: 400;\n",
" font-size: 30pt;\n",
" line-height: 100%;\n",
" color: rgb(0,51,102);\n",
" margin-bottom: 0.1em;\n",
" margin-top: 0.3em;\n",
" display: block;\n",
"}\t\n",
"\n",
".text_cell_render h3 {\n",
" font-family: 'Nixie One', serif;\n",
" margin-top:16px;\n",
"\tfont-size: 22pt;\n",
" font-weight: 600;\n",
" margin-bottom: 3px;\n",
" font-style: regular;\n",
" color: rgb(102,102,0);\n",
"}\n",
"\n",
".text_cell_render h4 { /*Use this for captions*/\n",
" font-family: 'Nixie One', serif;\n",
" font-size: 14pt;\n",
" text-align: center;\n",
" margin-top: 0em;\n",
" margin-bottom: 2em;\n",
" font-style: regular;\n",
"}\n",
"\n",
".text_cell_render h5 { /*Use this for small titles*/\n",
" font-family: 'Nixie One', sans-serif;\n",
" font-weight: 400;\n",
" font-size: 16pt;\n",
" color: rgb(163,0,0);\n",
" font-style: italic;\n",
" margin-bottom: .1em;\n",
" margin-top: 0.8em;\n",
" display: block;\n",
"}\n",
"\n",
".text_cell_render h6 { /*use this for copyright note*/\n",
" font-family: 'PT Mono', sans-serif;\n",
" font-weight: 300;\n",
" font-size: 9pt;\n",
" line-height: 100%;\n",
" color: grey;\n",
" margin-bottom: 1px;\n",
" margin-top: 1px;\n",
"}\n",
"\n",
".CodeMirror{\n",
" font-family: \"PT Mono\";\n",
" font-size: 90%;\n",
"}\n",
"\n",
"</style>\n",
"<script>\n",
" MathJax.Hub.Config({\n",
" TeX: {\n",
" extensions: [\"AMSmath.js\"],\n",
" equationNumbers: { autoNumber: \"AMS\", useLabelIds: true}\n",
" },\n",
" tex2jax: {\n",
" inlineMath: [ ['$','$'], [\"\\\\(\",\"\\\\)\"] ],\n",
" displayMath: [ ['$$','$$'], [\"\\\\[\",\"\\\\]\"] ]\n",
" },\n",
" displayAlign: 'center', // Change this to 'center' to center equations.\n",
" \"HTML-CSS\": {\n",
" styles: {'.MathJax_Display': {\"margin\": 4}}\n",
" }\n",
" });\n",
"</script>"
],
"text/plain": [
"<IPython.core.display.HTML object>"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [
"%run ../talktools.py"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"# Dia 1\n",
"Instalacion y configuracion del SL4A y del ambiente IPython Notebooks"
]
},
{
"cell_type": "code",
"execution_count": 3,
"metadata": {
"collapsed": false
},
"outputs": [
{
"data": {
"text/html": [
"notebooks/<br>\n",
"&nbsp;&nbsp;<a href='notebooks/D1S1L1_Instalacion_IPython_Notebook.ipynb' target='_blank'>D1S1L1_Instalacion_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/D1S1L2_Instalando_SL4A.ipynb' target='_blank'>D1S1L2_Instalando_SL4A.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/D1S2L1_Configurando_Python_Android_local.ipynb' target='_blank'>D1S2L1_Configurando_Python_Android_local.ipynb</a><br>\n",
"notebooks\\.ipynb_checkpoints/<br>\n",
"&nbsp;&nbsp;<a href='notebooks/.ipynb_checkpoints/D1S1L1_Instalacion_IPython_Notebook-checkpoint.ipynb' target='_blank'>D1S1L1_Instalacion_IPython_Notebook-checkpoint.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/.ipynb_checkpoints/D1S1L2_Instalando_SL4A-checkpoint.ipynb' target='_blank'>D1S1L2_Instalando_SL4A-checkpoint.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/.ipynb_checkpoints/D1S2L1_Configurando_Python_Android_local-checkpoint.ipynb' target='_blank'>D1S2L1_Configurando_Python_Android_local-checkpoint.ipynb</a><br>\n",
"notebooks\\Tutoriales/<br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib02_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib02_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib03_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib03_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib04_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib04_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib05_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib05_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib06_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib06_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib07_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib07_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib08_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib08_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib09_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib09_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib10_Esenciales_IPython_Notebook.ipynb' target='_blank'>Lib10_Esenciales_IPython_Notebook.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib11_GIT01_RevisionControl_1aEtapa.ipynb' target='_blank'>Lib11_GIT01_RevisionControl_1aEtapa.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib12_GIT02_RevisionControl_2aEtapa.ipynb' target='_blank'>Lib12_GIT02_RevisionControl_2aEtapa.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib13_GIT03_RevisionControl_3aEtapa.ipynb' target='_blank'>Lib13_GIT03_RevisionControl_3aEtapa.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib14_GIT04_RevisionControl_4aEtapa.ipynb' target='_blank'>Lib14_GIT04_RevisionControl_4aEtapa.ipynb</a><br>\n",
"&nbsp;&nbsp;<a href='notebooks/Tutoriales/Lib15_GIT05_RevisionControl_Aplicacion.ipynb' target='_blank'>Lib15_GIT05_RevisionControl_Aplicacion.ipynb</a><br>"
],
"text/plain": [
"notebooks/\n",
" D1S1L1_Instalacion_IPython_Notebook.ipynb\n",
" D1S1L2_Instalando_SL4A.ipynb\n",
" D1S2L1_Configurando_Python_Android_local.ipynb\n",
"notebooks\\.ipynb_checkpoints/\n",
" D1S1L1_Instalacion_IPython_Notebook-checkpoint.ipynb\n",
" D1S1L2_Instalando_SL4A-checkpoint.ipynb\n",
" D1S2L1_Configurando_Python_Android_local-checkpoint.ipynb\n",
"notebooks\\Tutoriales/\n",
" Lib02_Esenciales_IPython_Notebook.ipynb\n",
" Lib03_Esenciales_IPython_Notebook.ipynb\n",
" Lib04_Esenciales_IPython_Notebook.ipynb\n",
" Lib05_Esenciales_IPython_Notebook.ipynb\n",
" Lib06_Esenciales_IPython_Notebook.ipynb\n",
" Lib07_Esenciales_IPython_Notebook.ipynb\n",
" Lib08_Esenciales_IPython_Notebook.ipynb\n",
" Lib09_Esenciales_IPython_Notebook.ipynb\n",
" Lib10_Esenciales_IPython_Notebook.ipynb\n",
" Lib11_GIT01_RevisionControl_1aEtapa.ipynb\n",
" Lib12_GIT02_RevisionControl_2aEtapa.ipynb\n",
" Lib13_GIT03_RevisionControl_3aEtapa.ipynb\n",
" Lib14_GIT04_RevisionControl_4aEtapa.ipynb\n",
" Lib15_GIT05_RevisionControl_Aplicacion.ipynb"
]
},
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"FileLinks('notebooks',included_suffixes=['.ipynb'])"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 2",
"language": "python",
"name": "python2"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 2
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.10"
}
},
"nbformat": 4,
"nbformat_minor": 0
}
34 changes: 34 additions & 0 deletions Dia1/Untitled Folder/Ejercicio 1.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 2",
"language": "python",
"name": "python2"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 2
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.10"
}
},
"nbformat": 4,
"nbformat_minor": 0
}
Loading