Skip to content

Commit 93aa3dd

Browse files
author
Michael Klemm
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
2 parents 3e85fa4 + e7b0353 commit 93aa3dd

46 files changed

Lines changed: 4259 additions & 61 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎3-Analytics/pandas/1_Intro.ipynb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,7 @@
914914
}
915915
],
916916
"metadata": {
917+
"anaconda-cloud": {},
917918
"continuum": {
918919
"depends": [
919920
"ip_conda"
@@ -925,9 +926,9 @@
925926
"tag": "pd_intro"
926927
},
927928
"kernelspec": {
928-
"display_name": "Python 3",
929+
"display_name": "Python [conda env:python3]",
929930
"language": "python",
930-
"name": "python3"
931+
"name": "conda-env-python3-py"
931932
},
932933
"language_info": {
933934
"codemirror_mode": {
@@ -939,7 +940,7 @@
939940
"name": "python",
940941
"nbconvert_exporter": "python",
941942
"pygments_lexer": "ipython3",
942-
"version": "3.4.4"
943+
"version": "3.5.2"
943944
}
944945
},
945946
"nbformat": 4,

‎3-Analytics/pandas/2_DataStructures.ipynb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@
823823
},
824824
"outputs": [],
825825
"source": [
826-
"DataFrame.from_records(ra)"
826+
"pd.DataFrame.from_records(ra)"
827827
]
828828
},
829829
{
@@ -1117,9 +1117,9 @@
11171117
"tag": "pd_data_structs"
11181118
},
11191119
"kernelspec": {
1120-
"display_name": "Python 3",
1120+
"display_name": "Python [conda env:python3]",
11211121
"language": "python",
1122-
"name": "python3"
1122+
"name": "conda-env-python3-py"
11231123
},
11241124
"language_info": {
11251125
"codemirror_mode": {
@@ -1131,7 +1131,7 @@
11311131
"name": "python",
11321132
"nbconvert_exporter": "python",
11331133
"pygments_lexer": "ipython3",
1134-
"version": "3.4.4"
1134+
"version": "3.5.2"
11351135
}
11361136
},
11371137
"nbformat": 4,

‎3-Analytics/pandas/3_ExamineData.ipynb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,7 @@
992992
}
993993
],
994994
"metadata": {
995+
"anaconda-cloud": {},
995996
"continuum": {
996997
"depends": [
997998
"pd_intro",
@@ -1004,9 +1005,9 @@
10041005
"tag": "pd_examine_fancy"
10051006
},
10061007
"kernelspec": {
1007-
"display_name": "Python 3",
1008+
"display_name": "Python [conda env:python3]",
10081009
"language": "python",
1009-
"name": "python3"
1010+
"name": "conda-env-python3-py"
10101011
},
10111012
"language_info": {
10121013
"codemirror_mode": {
@@ -1018,7 +1019,7 @@
10181019
"name": "python",
10191020
"nbconvert_exporter": "python",
10201021
"pygments_lexer": "ipython3",
1021-
"version": "3.5.1"
1022+
"version": "3.5.2"
10221023
}
10231024
},
10241025
"nbformat": 4,

‎3-Analytics/pandas/4_ReadWriteData.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,9 +1337,9 @@
13371337
"tag": "pd_data_io"
13381338
},
13391339
"kernelspec": {
1340-
"display_name": "Python 3",
1340+
"display_name": "Python [conda env:python3]",
13411341
"language": "python",
1342-
"name": "python3"
1342+
"name": "conda-env-python3-py"
13431343
},
13441344
"language_info": {
13451345
"codemirror_mode": {
@@ -1351,7 +1351,7 @@
13511351
"name": "python",
13521352
"nbconvert_exporter": "python",
13531353
"pygments_lexer": "ipython3",
1354-
"version": "3.4.4"
1354+
"version": "3.5.2"
13551355
}
13561356
},
13571357
"nbformat": 4,

‎3-Analytics/pandas/5_Groupby.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,9 +1277,9 @@
12771277
"tag": "pd_groupby"
12781278
},
12791279
"kernelspec": {
1280-
"display_name": "Python 3",
1280+
"display_name": "Python [conda env:python3]",
12811281
"language": "python",
1282-
"name": "python3"
1282+
"name": "conda-env-python3-py"
12831283
},
12841284
"language_info": {
12851285
"codemirror_mode": {
@@ -1291,7 +1291,7 @@
12911291
"name": "python",
12921292
"nbconvert_exporter": "python",
12931293
"pygments_lexer": "ipython3",
1294-
"version": "3.4.4"
1294+
"version": "3.5.2"
12951295
}
12961296
},
12971297
"nbformat": 4,

‎3-Analytics/pandas/6_TimeSeries.ipynb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,7 @@
12941294
}
12951295
],
12961296
"metadata": {
1297+
"anaconda-cloud": {},
12971298
"continuum": {
12981299
"depends": [
12991300
"pd_intro",
@@ -1307,7 +1308,7 @@
13071308
"tag": "pd_series"
13081309
},
13091310
"kernelspec": {
1310-
"display_name": "Python 2",
1311+
"display_name": "Python [default]",
13111312
"language": "python",
13121313
"name": "python2"
13131314
},
@@ -1321,7 +1322,7 @@
13211322
"name": "python",
13221323
"nbconvert_exporter": "python",
13231324
"pygments_lexer": "ipython2",
1324-
"version": "2.7.11"
1325+
"version": "2.7.12"
13251326
}
13261327
},
13271328
"nbformat": 4,

‎3-Analytics/pandas/EX01_ExcelFiles.ipynb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@
317317
}
318318
],
319319
"metadata": {
320+
"anaconda-cloud": {},
320321
"continuum": {
321322
"depends": [
322323
"pd_intro",
@@ -328,9 +329,9 @@
328329
"tag": "pd_ex_excel"
329330
},
330331
"kernelspec": {
331-
"display_name": "Python 3",
332+
"display_name": "Python [conda env:python3]",
332333
"language": "python",
333-
"name": "python3"
334+
"name": "conda-env-python3-py"
334335
},
335336
"language_info": {
336337
"codemirror_mode": {
@@ -342,7 +343,7 @@
342343
"name": "python",
343344
"nbconvert_exporter": "python",
344345
"pygments_lexer": "ipython3",
345-
"version": "3.4.4"
346+
"version": "3.5.2"
346347
}
347348
},
348349
"nbformat": 4,

‎3-Analytics/pandas/EX02_weather.ipynb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
}
129129
],
130130
"metadata": {
131+
"anaconda-cloud": {},
131132
"continuum": {
132133
"depends": [
133134
"pd_intro",
@@ -139,9 +140,9 @@
139140
"tag": "pd_ex_weather"
140141
},
141142
"kernelspec": {
142-
"display_name": "Python 3",
143+
"display_name": "Python [conda env:python3]",
143144
"language": "python",
144-
"name": "python3"
145+
"name": "conda-env-python3-py"
145146
},
146147
"language_info": {
147148
"codemirror_mode": {
@@ -153,7 +154,7 @@
153154
"name": "python",
154155
"nbconvert_exporter": "python",
155156
"pygments_lexer": "ipython3",
156-
"version": "3.5.1"
157+
"version": "3.5.2"
157158
}
158159
},
159160
"nbformat": 4,

‎3-Analytics/pandas/data/201509-citibike-tripdata.csv.gz‎

40.2 MB
Binary file not shown.

‎3-Analytics/pandas/data/beer2.csv.gz‎

14.8 MB
Binary file not shown.

0 commit comments

Comments
 (0)