From 8dba03020b26ed9d42c711cc03731350b85af734 Mon Sep 17 00:00:00 2001 From: geraldhood Date: Tue, 5 Jun 2018 05:40:07 +0000 Subject: [PATCH] Done --- __pycache__/__init__.cpython-36.pyc | Bin 165 -> 148 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 179 -> 162 bytes .../__pycache__/build.cpython-36.pyc | Bin 568 -> 312 bytes .../tests/__pycache__/__init__.cpython-36.pyc | Bin 185 -> 168 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1577 -> 1560 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 180 -> 163 bytes .../__pycache__/build.cpython-36.pyc | Bin 626 -> 640 bytes q02_append_row/build.py | 12 +++++++++--- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 186 -> 169 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1355 -> 1338 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 182 -> 165 bytes .../__pycache__/build.cpython-36.pyc | Bin 888 -> 871 bytes q03_scrape_clean/build.py | 10 +++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 188 -> 171 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1396 -> 1379 bytes 15 files changed, 18 insertions(+), 4 deletions(-) diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index b4b72099455159189764a0ad76aa1fabbc62e96a..d50b029dde7e2ffedfda9bbe04c28eaf1970a2ff 100644 GIT binary patch delta 52 zcmZ3=IE9hJn3tDpih@}5L=JNWNBxZa+*JMa)S|?kl#KlR6#el0qU_>=#N<@{ Hi3O$rjVKWB delta 69 zcmbQjxRjB@n3tD}Z`Piui5%vJLHeP^sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`OA0UH_^!~g&Q diff --git a/q01_load_data/__pycache__/__init__.cpython-36.pyc b/q01_load_data/__pycache__/__init__.cpython-36.pyc index 92b3ac2d3dd2682028775eba5dae0f9658f2aebd..17b083b9d9a5f635d11f06a7dc50e04c618aa8d3 100644 GIT binary patch delta 52 zcmdnYxQLO%n3tDpih@}5L=JNWfBlU7+*JMa)S|?kl#KlR6#el0qU_>=#N<@{ Hi3QF8l(Z2i delta 69 zcmZ3)xS5f|n3tDJb=ID!i5%vJ3HqVMsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`P50V>oP6951J diff --git a/q01_load_data/__pycache__/build.cpython-36.pyc b/q01_load_data/__pycache__/build.cpython-36.pyc index e27baf631ae2be11ac2de9e6f21754e2497753d8..51aa281fbf57ec1457bdf8fa401bfa152f1fca84 100644 GIT binary patch delta 172 zcmdnNvV)1!n3tDpih@|Q-$YI)aYhCP1`u`z;$jvck-`|vpvg3Go|Kv2N(N2FTPy{M zB^gCbKp8Oc%SS&WKQ~oBJ+&w?CnY04KSe)0zbL!7ATc>rKRG`ob+R_2o&#^8fnj`3 uequ^|N@7VO$k<{aW+-9>5}M4n*a{N!QWA@AF%_hMg%HL=SS*tjm?Qv~#wa)d literal 568 zcmY*WPfIH?5TERJ>r(7N5VauK>t0;NYbk<{cX;r;h?jzt*(Tbp=_V#wv{Fxf-{YPA z4t|nc1;MZ2$w{lCf!}ZbW@a)uYPVa{|4)M#0C*;Rortt!g54zIz?p;r;}MVl!64%7 z46?>6Mc{PAf}j&_#Do)qJtlH6VRKlp2R3J%bzl;$?k|>h56Ii-1Wr1z9c1%Eu7wzN zNbh%UP3c5;rfSo*O4hDaRd+0m@QHQk#8>k$M8FxrrbKg?z=F(-oo37@Qr!we3cGs* zlTiHaB0smn*c^*-X~*K))`h_-RwY*XFJZ5p(z(*28fv2^V&rVDvEpclS9Qq+|8(a! z2ZuwckPkUJ%!|5|d|%Ie+LJgfIQG}VL-?EcTJ+zGVdU5O*UXeS%ucSr++*MmP2mzg#|PMNMku+do=0!U$n05VhDA+ht~h ibSm6jJ;|(-x%7Rj6P9F_#nRqX@mh+0Sg;M>oW}1D6OCyA diff --git a/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc b/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc index 2a2dfc72b54611f7a4f5a7734a9c697f606c0089..0a0daf64563aad8419755ea75d64f0a47d09e9e7 100644 GIT binary patch delta 52 zcmdnVxPpQ2mVj+*JMa)S|?kl#KlR6#el0qU_>=#N<@{ Hi3Oejm>Us5 delta 69 zcmZ3%xRa5?n3tD}ZT6n1i5%vJY5JkXsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`N_0Vp{c4FCWD diff --git a/q01_load_data/tests/__pycache__/tests.cpython-36.pyc b/q01_load_data/tests/__pycache__/tests.cpython-36.pyc index 76e04c8a5e2c476c2fba795d8bae25fd09cc88ed..3e432821c9751c24d4fc4a5725593777bcb55bd0 100644 GIT binary patch delta 55 zcmZ38VADIVlG0`9;~q1&PV2`pNkz Lshf?NzA*y;;9?T4 delta 72 zcmbQivyz9yn3tF9-|Rh68##V48Yb(97N-^!>nA2AR#B cXP4v`=;s%t=EWBj0R4>o+*JMa)S|?kl#KlR6#el0qU_>=#N<@{ Hi3KhIl|B(G delta 69 zcmZ3?xP_6!n3tE!c-Ee%i5%vJiTa_%sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`OQ04~`XB>(^b diff --git a/q02_append_row/__pycache__/build.cpython-36.pyc b/q02_append_row/__pycache__/build.cpython-36.pyc index 508826776138177582df97d666bb284c1e1484b0..2e41ca69c254ce7961885e7be2e8376bbb26aebe 100644 GIT binary patch delta 262 zcmeyw(!g48%*)HAq$CzSk&%JnF#{4{0kR!{xY!R!q%fo~<}gGtf@!8GCNRw$#hl8N z#gfIE$_ymgz$816(t|%@bn>mH0g&~SNg)x{xll3LgOa?zq##>?f@af>A@KQr$ZdrD?eUSe+QEw<#+A|N|Tc(MkQwICBv QMKQ=M4n_e+IYu640DU7iSpWb4 delta 250 zcmZo*{lpSv%*)FadF^1-CPoH^#|%h-3CMN;;$j0Jk;0I|n8Ogo2&S2$n7}l16f=-! z%3;Z6jbdeFNMTN4X<>+B+gKpXXc(s-TAW%`te=>aky)IPnq6F)RFs&Tn3tKDr|*(l zoL!P%pr2omnipSCl%JKFTv9xFF{51wJIFpRAi==I!6?GW2ZTj}K%OT1Ew+Nhyp+V^ zB2FOp7ISfB@hztO;waPfqSVU7lKkA9%p^UCium->%#_p=n8A9JO_;3tfu3V1W&;u& Ji~>wN%m5YQKLG#$ diff --git a/q02_append_row/build.py b/q02_append_row/build.py index af3701d..fc4ca60 100644 --- a/q02_append_row/build.py +++ b/q02_append_row/build.py @@ -1,11 +1,17 @@ + import pandas as pd import sys, os -#sys.path.append(os.path.join(os.path.dirname(os.curdir))) -from greyatomlib.pandas_guided_project.q01_load_data.build import q01_load_data +sys.path.append(os.path.join(os.path.dirname(os.curdir))) +from q01_load_data.build import q01_load_data def q02_append_row(path): - "write your solution here" + 'write your solution here' + df = q01_load_data(path) + sum_row = df[['Jan', 'Feb', 'Mar', 'total']].sum() + df_sum = pd.DataFrame(data=sum_row).T + df_final = df.append(df_sum, ignore_index=True) + return df_final diff --git a/q02_append_row/tests/__pycache__/__init__.cpython-36.pyc b/q02_append_row/tests/__pycache__/__init__.cpython-36.pyc index dab3ecac755f4882f0d0d63dd70ab57f6fb428f8..93004bc7ecd2375d588aaed0ab560955e11aa0d2 100644 GIT binary patch delta 52 zcmdnRxRQ~>n3tDJMM*4rB8Ry`n0`inZmNEIYEfcNN=ANuihg*0QFd`bVsff}a(+tc H!~!n>h5iuL delta 69 zcmZ3H49?sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`Pb078KoegFUf diff --git a/q02_append_row/tests/__pycache__/tests.cpython-36.pyc b/q02_append_row/tests/__pycache__/tests.cpython-36.pyc index 742ee79571b722fe1fcab2f42f1dbcae23a14bd1..0937539180efbac29e996a3b4ba2f9ef1864fb36 100644 GIT binary patch delta 55 zcmX@jwTp|xn3tDJMM*4rBga`rg<$=R{M=Oi^wgrnoRp0G{1pB0{G#mQg2d!h{p9?V K)Xi*6uFL??`4M#h delta 72 zcmdnRb()LAn3tDJY{8zWjT~ng4O8?(i&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuvtWprf*0G;$2#Q*>R diff --git a/q03_scrape_clean/__pycache__/__init__.cpython-36.pyc b/q03_scrape_clean/__pycache__/__init__.cpython-36.pyc index e99e1734469b0d74feccbb92229a5c70c95d8904..8de67f6e5b4373c7ed3cfbbbb5793a3d842f6de6 100644 GIT binary patch delta 52 zcmdnSxRjB@n3tDpih@}5L=JO>ApMN|+*JMa)S|?kl#KlR6#el0qU_>=#N<@{ Hi3M%|mQoQj delta 69 zcmZ3=xQ&s+n3tE!a@L-xi5%vJ$@-zisYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`P*05Q86GXMYp diff --git a/q03_scrape_clean/__pycache__/build.cpython-36.pyc b/q03_scrape_clean/__pycache__/build.cpython-36.pyc index cdec2c4c90379271521fc76a792f2606530a2690..17d1fc36936c3b4bb782400c39342f5972b88005 100644 GIT binary patch delta 178 zcmeyt_MDB=n3tDJOGzyH`$o=Xj0*nx8Tq-X`st}fi8(15`S~gO;rT_`#RZAUsrt$J zDXEhmFj_J4O_pW~wu<5`N=;0O&nU^wxy7EGpI4HaR}#gNnUkM)X%FEKYYiZ!vI zAg3~lEwQ+yvLN*qTYgejYH~@`S48?pvf`N&PQGij5QHN26k&CfNWb%I| YH%5`kZp?~;OdvHNg&aT?9E@_z0BEf-^#A|> delta 195 zcmWm6F$%&k6oBErs{L{z(CO_g&!!YQ+9^3ETzrkc5Zxl)u(P(!2kdN diff --git a/q03_scrape_clean/build.py b/q03_scrape_clean/build.py index a88e3e2..10b87cc 100644 --- a/q03_scrape_clean/build.py +++ b/q03_scrape_clean/build.py @@ -1,3 +1,4 @@ + import pandas as pd import sys, os import requests @@ -5,5 +6,12 @@ def q03_scrape_clean(url): - "write your solution here" + 'write your solution here' + response = requests.get(url) + df1 = pd.read_html(response.content)[0] + df1 = df1.iloc[11:, :] + df1 = df1.rename(columns=df1.iloc[0, :]).iloc[1:, :] + df1['United States of America'] = df1['United States of America'].apply(lambda x: x.replace(' ', '')).astype(object) + df1.to_csv('data/scraped.csv') + return df1 diff --git a/q03_scrape_clean/tests/__pycache__/__init__.cpython-36.pyc b/q03_scrape_clean/tests/__pycache__/__init__.cpython-36.pyc index bee36fb3d7bd79ff797a0f6b391b7a8a93cf3fac..329eef22b9e4fbef99e953022bd06b9e0e0ef7c1 100644 GIT binary patch delta 52 zcmdnPxSEl}n3tDJM@cMtB8Ry`gnmYTZmNEIYEfcNN=ANuihg*0QFd`bVsff}a(+tc H!~!1xh-wh! delta 69 zcmZ3@xQCI$n3tF9*up(g6FJNcGxbA@Q;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYLbV003Ch8Q%Z^ diff --git a/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc b/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc index 8529c871c1d09e03d187c6dc0d0810c3df16d3e3..cdc73ceac373e7a4d956eceb81a53c7341ce88cd 100644 GIT binary patch delta 55 zcmeyu^_Yvpn3tDJM@cMtBgYp;g;4#B{M=Oi^wgrnoRp0G{1pB0{G#mQg2d!h{p9?V K)Xlm~?#uw{w-O-$ delta 72 zcmaFN^@WSWn3tC;bkUxujT~PX4b${Pi&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuwkFu5}W0LpC|s{jB1