From 5ac4cb45a73bf42bae88cfc87988f80c261b56fa Mon Sep 17 00:00:00 2001 From: Christian Panse Date: Thu, 2 Feb 2017 10:06:13 +0100 Subject: [PATCH 1/8] Update fcc.py cosmetics on initial configuration host --- fgcz/fcc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fgcz/fcc.py b/fgcz/fcc.py index 4d5e972..260f184 100644 --- a/fgcz/fcc.py +++ b/fgcz/fcc.py @@ -358,7 +358,7 @@ def usage(): class Fcc: """ """ - parameters = {'config_url': "http://fgcz-s-021.uzh.ch/config/fcc_config.xml", 'readme_url': "http://fgcz-s-021.uzh.ch/config/fcc_readme.txt", + parameters = {'config_url': "http://fgcz-data.uzh.ch/config/fcc_config.xml", 'readme_url': "http://fgcz-s-021.uzh.ch/config/fcc_readme.txt", 'crawl_pattern': ['/srv/www/htdocs/Data2San/', 'p[0-9]{2,4}', 'Metabolomics', '(GCT)_[0-9]', From 1872626d82ba46da4e0f0716f8b18dd6bf57be7a Mon Sep 17 00:00:00 2001 From: Christian Panse Date: Thu, 2 Feb 2017 10:09:05 +0100 Subject: [PATCH 2/8] Update fcc.py --- fgcz/fcc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fgcz/fcc.py b/fgcz/fcc.py index 260f184..8e774a2 100644 --- a/fgcz/fcc.py +++ b/fgcz/fcc.py @@ -1,13 +1,13 @@ #!/usr/bin/python # -*- coding: latin1 -*- -# $HeadURL: http://fgcz-svn.uzh.ch/repos/fgcz/stable/proteomics/fcc/fcc.py $ +# $HeadURL: https://github.com/fgcz/PyFGCZ/fcc.py $ # $Id: fcc.py 7518 2015-05-27 15:20:12Z cpanse $ # $Date: 2015-05-27 17:20:12 +0200 (Wed, 27 May 2015) $ # $Author: cpanse $ -# Copyright 2008-2015 +# Copyright 2008-2017 # Christian Panse # Simon Barkow-Oesterreicher # Witold Eryk Wolski @@ -80,7 +80,7 @@ 2012-12-04 handles dirs as files, e.g. conversion of waters.com instruments raw folders (SB,CP) 2015-07-07 on github.com """ -__version__ = "https://github.com/fgcz/fcc" +__version__ = "https://github.com/fgcz/PyFGCZ" import os import urllib From 975bd321881fc212025347113c93906a7f6dd982 Mon Sep 17 00:00:00 2001 From: Christian Panse Date: Wed, 8 Mar 2017 09:02:21 +0100 Subject: [PATCH 3/8] Delete fcc.pyc --- fgcz/fcc.pyc | Bin 16991 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fgcz/fcc.pyc diff --git a/fgcz/fcc.pyc b/fgcz/fcc.pyc deleted file mode 100644 index 5f7e0e555f0b700467bb2dde1c58d64b73040f18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16991 zcmb_jNo*Y1d4AQ+wMB{&DT$&+nkj9grbcYCsbx4CYBCZ@EwMy$syU{H64O)cswRu< zO;yz*dqgHdG#T50x7bdAzyWfJ6WfT907(E}3}2Fi4Ft#~NKUy0h;s{a$R$AXegCWK zZY|dM5K;B|)!X0y{{4TI{ICAh(2xFoxuBwd9r%48Pw*o{DMzUlq=s5Cl#@_SQk4>F z1sR=Bs+DA%?@%ipalTWnbjJBEwbB*myVXi}obOR9J#oHQt@OtElv+u}`F(0-U!3n# zD}8akU#;wq^8;#SAkH69D+l8I!M6OMS{YOhmUmP+-Re_pVMw_{>M3@2NI5;qJ*|HN;mL-Bj*LENoWFBlzu5kIz3f)P;HuP(jaBPm ztsa`&z8AWIX`5?ySlBR&Udc7Xs_EA&X36H1WxG#!S zMz^wE@&c^f+^+gt#ZqS=gHNRQ|>^;CJ+7L?CeYeZ$--mo$ECZ+JkJvTIiYv*K>Y zd&c>!HKZW4x%*a!`2}-kVRp`(xqW^9*4)Wxk|18` zmbA%vWgyZG+uy2gk1YTd(A34;n28-{Hhi9?T`?E26xWNv5#z9;jq) z&b)p%w;;o9gkdeXIzGPcg&Xy?46tyV&BuWtQtwo~tJ#T6Ham4?Jp1Rq$2!NYaT;Bf^twQAG_Ym}AhF}Zteo;w~x z!%Y2?4ZvvpvFC0-E@(i2)^Om&`OvMFy+T0H@X6E~zZNh0+SKK@-(;_AWgJYs7Ei|2 zk4?P&|2$cC@|}ynbhfO(^8(_-6>j6*vitdSR|C=hCQM^s8ma zBFKpcn-7y{1sn|e@teIkk-0LFnaXCe zm!`Z#La72C)rp7AX7B{Rfh1IF(@>jG6AiU%P;=Q!NTKM9&|>zIYB!-aJJfDc;niS= zPPGdS33Vv#P@7O2bsb;2*_;jWl1q1R9utWGu>iaYAxH)90Ojf$rI=KO-Dm`ogANb` zhmb#;CT@=g=Gk-^W%fGq9xKw&o0K$!*=ZlE?uqHg4XUS&8_qtXe}SuUoHkV2-Xj4jThTe*%xupVXTHSDzuG z7Ff@JJklF@f^j4+)L|&eI6(YYqD3QPh?3i(Tv7NxmGgtbZ|O5Ca0EVF?+l*cyGT66 zgU%xbav&op0xfx~NBPqnQkxeJ6n2c-rPjNmW>9p2ja1=f1Yp?HgjAtr4>Oz4gnQLA zP=&+wDu0h?6IG&!yJ^#-CL8l zXLoPSEbT5>H}33yFn9m@%+j4N&b4y4Z|;7uw7|r=zPP)TotW6gD@&H3nBJX}T<(M2 zFV5Xv$c^S@3Bh^H@W3AXgp0{e?dj4dQ+w(BgE16eA6vmn^Q&)-KAE_X-3vz9{F#bO z8VIlp^>TOHD;6brmiIMqgiL%_2nvj<25~C2 zA)C}*iL|7<>5^SubL{uNf_#8Sc^A-8@EIC-o~%CaV1>HG-f5M1(`?N%^GN$1smlYt z0_!?30te>^f%l0!?;QXsc)$IDf#hm0k~0}J`=+5 z4pm+F+=dA>1i=VS%v%&S8VQuj`N=(}jJcaluv(h3{X;Dv6vet1H;?Z>Y z4Bxl7i|?_DRQQJR;tt8sHR(b|>y7DiiuP5@#MMBCh`2e{ymbVr0Mas%vrZxr1jk}Y zQ?k}jh%SI8qnCP`eF)*tUG$%$kt}+^NK@p>Bw8wi?l7Q8J}BpqxfazInF>O&u%VaI zgR%<5qyUlhpk=0YmTh^!B{(n$Wv3YAWiWRKBL|YTYc;pxq=_K1QavPldCrdXrZ0ig zf#!jby2ZW8X~Bxkb5=Q%)^1;v%GL#R`4*nw3=(B@C6dMv2)onhNsNG;UpL+|P8fs6 zq2z$k3nAT`l=I^<2-g`r0S>E$czZ^Kq&Pg#nSlcXx?-2msGvphRorePsH92-LIGuJ z^$d-AS|fp^kD?I=VLhC37y}pQL0|~5o;-AR8JrDv9pG0yqTC6 zJQUQ*=cyXz^CD*Qd2LqZ^VSG@Sd6{O#M37B34I~2g2+{xxC`~j5U=L)6`o(E7x`2!U2M=c+9B$cnVL`4}>=KS= z?_IM9-xp3Q;=h`k$N><)#g(H0O_V3{a3vf^YZiiTGMa`m2W##0#Z78$S~|qq^iMf3 zM^(m%=8mNKCUy0LS84vQc_g?qc57hwAT_25)p$g9qIZsE03;xqVNlnw5Kk8g@2N;& za4(P$8bF@~?|5n$kgMzh(o3-y#$p{n&Q?nKKZiBd1q#Ld zaDziGqoEM(FqGwCzKH~um56lL3+--i*rOYwZBj^n7<#jGeRd;Q_Bs{26u>htjCm{@ z@P$6wU0Ckd&IM%b=P)Zky5W{eVqUmA1y>v!yEV_bCJOcLLT-*;x@*#aI$_C$OIJ7G znQHnKOw=Q%iJjJaNQAO-cW&L8U$Wk3p~!}dtPvaueW7BZkD$H=A}GMPlQk`Z9yG^a z^6Oe*!;%E0wrwvIZVq7roe(ypNSbJ!lHay{`T;a45=XG*yKwc&(B;M=M&ibO`UtGc zT-hKO#WFAg_;v`KS7Rr)Qf|xvp3CB&nfN;th;geR7P|14G+u+IM|-UgfBW$}iqgw1 zu}*58VXxCjG|Fm(q$s#`8|Vvp5D5n%Q4!_BM#YrY;CvUIt!XCLkZ1`;P3V=hMGi_= z$3jI8_n+}9C#b;3I$NaGgK}Bn_af2~IucR=ZGlc8!XTNDNvNHF6pF#E4RXM1N8&w7{VKTI4*?)fS1sl zBqS|nyfB%T3szb)ULs3ga}j`mb3pfnGTF>;xefSV5u<5e3TKId*|q{rluK;+3}65$ z>x(G0mXT<^<33+MV$1gJYnANfeWeEncu6 zAg6h65;@`(xn&bkW;qenal$dUOUs=6*0XX*C2Ly`k^Ni_CfGeAnDDP?AH0u5b@oI3 z?oAv)nuJ<@G}#YMd=w9Kw8S73^rUgb*r)4_L*RFVXmK=gFe)!_DTD%-K7%LtD&!X;TQBT~8 zJ~7=^6FFE+hz<9C-n$Y;mhHO3HJKhH>8c4BfW@3=w1_k@j%V>dS3 zEyZdcljhx>8o7q-HTVPUI&(g)-Ft71K6v~T8l+iYaL|bFd^v(X|5xH zThol`QCub-FU^NBMied+T@7|J;=`|`I~sZ53sJ9|5hLe920%FhFEgl~E+N5zL>E+{ z)?eiEBIR>WLR`NGNPxJWiq1_Oeog$zvm`OCsWXMYN)%iuLzJ@GY~c&ZF`vpGn)4?^eW@P7|uKUde+tkV`szoLSH3oawrRbU%n1g&>}I|259i!Raz zKis)4JD|((!+w7h_tWoDn}fOye%R(GaU1;}wHefHhR~)n9y=;Kgfe&)^?ZkQyCX6d z%K+P<_}s8n6mhGE$jrEbVeC^cw&%HqYl-OOpdj+(Ml{ILN5f{=Ii|tB{XfJGa?!&a zQcj`^$~6j?AN>zc1L=J{%RHd;ao}a}*GPnwXnzMnbd*!zVRk5tP5f3mV%SnBT9-St zYBj&GGX3zdYf3ED<~q&=^z@u-Ux|;4M$lOyXCgx{BhenY>Jvqy+hxvt znoP@bnTYRY207t(LA9`ja5=RT@HA?nYYm1Sg*iqg^x+6A4QeGXY`K?Y052dQtuq{2 zj9XEH#5Hw_WnW;@;>~o)Xx=Q|5ZCtM0L`E*{G zrT~z|@to;I>muA$_zMP959{_=ue=M56_eNWD?KCJ*`huC)Nfp0jt9|)ShGWqN%TjVv_Jx zbj(-6gF;jXUvuIBy+JSaDgi5y-c&1)Xh?CB@-?}1xV!k1_GjUVXltLKRCna-&k?L~<3xTNBK9bQh7oEl?CbRKXCv7e= zzMj|F46PDUnSRaJ{ZjC&j==jaWj7PT!sQ71RYo9p`DHQZ@%EteB!bRD)$MwzG)N=5 z9LI$xFr4V1uZ{~dDm*c<7e$AOZog`DSlea1Jir(T{Am@@QAPKx%q)KRd{mZrE@7}% zTsJ7WZfzF#1u5OM`H0I*lA*IPNTLgfw_P|1k0-uo&KF2ReE2$pCpd+q-P$s=tp%o# z2g)WOx`ogP6bH+z}ZX)6xYBI6e+SbX>(ftKs6uf^uLK-m!a3H2FRkiyueLAE(@i3da%Tv~!f zW-?$6IfH93@%^oNS%hF%vodIlT5tkb^VSA_U$sh+6&MsJ?Au@FY6)wVuqc-$YQR%% zF8AknX{@x4fPqHQL$OiuU5h6TFIp*QND7|srot^oF9W*TV1^s3z5jA$CU(5xwz#<5 z#I2Qz6!E9xZYNtY=pYy6JSr>l=zj-MLd3lr`+27T3L6?isXp8`rdIL51#|bA$n~J0 zfjtS6V3>;JsxK__R;wm|tqwtF&=>V^4BCth^?gcq!>whoYO`LWO2_+cR0*Sd!OyZ4 z8BD8W>?o%k`VBFqamNgPZSx!`;vBKn6s+QsVmFo~{;A zxK_(Ffl>pP;V@A{jHg{bqeM73{Q zJDTCHK}J5GfL&woY6eVHF%v-xTOG>(Dm6cdTL*!qzE&-V6T&h8tet-{&}Vk_A80tz zN;)W4roP=;8%T#2FR)0|!Y8f!(vH-thjrLZ(&fv}!i{lw< z!Ur0#!7!@yB!PwpX{tig;0qe^dxj=>Xva$9s07zp^xUxR1UBe|J&Q?7OIJvF4k;aWd>euVaU(1}CWnm}0{-K`;F0K7{%QhE^()HhapOr6ZY#8}H;=2$ z6DoY210wVW3!I;p0Bzv9=b7Sr5?HnXiNH%hwvu?Xnt1ea;?cJi{x9Pkb7_X5f{&3j z*%c#hbhMf_NS@zm@cO&{)B=TwYnf?SEWEuM$PHm!w$OKc$$Ofk#G(6Uf%Ti1M64|> znW<{D!tI*7$$Vrtd`;t{g*c`U{*~Q3r;R>vGG58i_TD!!NiDT?7~)ongO3Ao*bTlhFnuSXx@PVIJHEb*N*q7 zJLlH|^I4XrrF#iOy^4XzZJd82*FZx(GXRaqCt!Z<+!OF`z?>kTPn&3<{ce&w$=6XN z!VUolT4~l}mV%3D3(xu%b8j(e*^T74+Cm*ePK-_gWQ%o5j898+TBGm?%FCJ^xH8FS z>_^sxZ)G;fvI)7eb6In7kzJC7{f^M5cojF?9miXTO=kx&Y*c7AB$E z9=`LsIo#E97oe>YYTB!gP9PAeb>HU+E@CXz-J2Lp4jO&QHxLHsg3(ITwAUEvG{O1l z{_ipl7>96SkAFvSMQ;%AN#j^ze^ED1%FEzQDqA2J0kAc zgb@xLeH_x5WL4 zt%z{=Gh2lgxU*$|!~6e|;Pgl0>EPf*M@}~^)4{X^L4#*ePe)c zjH<5yRv2E%3^#Iz7pH>T=L&$+o2F$^U_jZP7BVVUd!xQa+RDwO{MMH?R)WJ7qw82B=j z31AwIpHhw0+7h(>23dKBk_0tSvciak6~4qg<&eV|TMMw$cx%r7%P-zpWwdLqj4WPO z#-r0KqsvZXo*1`itRJGOh*|5q%-v-2Crq}OTw)?R1H)``S5UgrAZtl)I0bZAUN$aTM4?oL z2Y_d@S@kM%%|MHA$}YK$iHi`-bJ5s`s13z(D0ic@4iT(tiA!8UW#gl>1zFpXo$a+7^cGm3FnPk{JtjApyw5~Vv=_N@!>U%H@%Yx?;!O?|<7qFNjy3!x z%MT!dlR;lw(Tpt6x+1ATUjzLPb8^h2@n7){D5#NwNr}Ip3!zr6!th&zl+hjir4oI{ z#e}|(CPCR`Z?d?(IHQ_&V%Yx=`g_Ov8pFrOCeo z*DVV@f-Psj&7=FDf+;V4ho+J0O>X;VNaR@Zd2&p+6R|9lHH_%%3xz$%#UC$Qa$2(} zk+X)r>+Wc3WGlL9gan0Bc?v>@a3f^koXA8@3h`c8KS8ZU#Fo?ICs!cRO#Bg<^*vVa zXF?_*NTk12(=6kC)`)&=F$amOw6afB(Hj3}%t6vCi>D?CE7VBHv6EK2oqD+@XrO_@ za>>0&WO8)V`aP GH2x2u76l9d From 2ca9ed080e425acc1f2e9e694b98314afc78a8dd Mon Sep 17 00:00:00 2001 From: Christian Panse Date: Wed, 8 Mar 2017 09:02:29 +0100 Subject: [PATCH 4/8] Delete biobeamer.pyc --- fgcz/biobeamer.pyc | Bin 15477 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fgcz/biobeamer.pyc diff --git a/fgcz/biobeamer.pyc b/fgcz/biobeamer.pyc deleted file mode 100644 index dcf99165ed89f6e74764614d15bfbb0f0532570e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15477 zcmeHOOK=>=dG6W8YnK2C@c{u6ZBHyZT$;o#KuMGYQ?wxPnIb`W02&emdOg^k#SXB$ zvz(qKuoB?dCKD@hoVXk(m0VM)$}NXf#fMboadhSCQ>uK(F%?%%x#W2MUy8~byz({w~ndmi1Nl&4IRy?$4Wg?>ch2{SSU`-r>VzP z^@#G0OWDyh6;+KTsYlb)ld5`*FKee%bzCA7s``@ha%$^kso;28bduAxTsX;D{71}Z z{>)9!t=@BP&)M}TYR{EQwav=M)B0hn*!j3#tkg@P*ABF#mUQH9G`vzf3?eUR`W0Pz z-w)pR+@=>wf%1kQY{+Y|-L=o;&)llc*{tti##`^qzG+{anSFD5_Tu!#S$pQ~x!Fr| zvu~~0mA2c`9>2WmM&8_kLhqPD_W7CFnHjrqCum);@$pr!BE`<(tNcRH?uPzmJwnpV zrD?WdU+=Ukksq|&hJC|pNw@6XY0#x>-O~kwYnU@1>5tHAKDMSP~+Wx zJ!v4W?SdVI`GOm88#xUxr4FlWp8x4EI zvpd?Wbs87)m;rnB*2>Mh_g3ur#SiV(dB>SwT>0=zC>hlQS-iHqY+t|Y*z@+%yt8s^;oj|e$6mVUEZtqc zRu2yztV5KA|y9>d%0>odhmGsU-Oi?eUM?PoGdRq!Z&LVR7o zqnijKrM4`!2avMVen#zO)K*4mU(yj5SlzP#Vb*?D5`lCXDLkO|vTAEk?G5nN;+I2A zN?wMg_=vo>6l-2Cu<6BU7@=FOhMv}%5cP#Z3*d52+g~U&k>+k9Uf__VWFy$z^jn)U z#!WA}jaM&>Mvz^{)@)#xL>%yPS0n4DNs_|XgRtpF*b>nw^0gQB67onu50cWX4EeVq z&W&gQFSi!2-z{*i=W9z|4lHQvf`KcrE}rfIZ*d?kS{B38Pm(bH0; zT`HF=b+59G?W0Re-Rn0N)(q_SqpFOk5_;IsWz*gTHaE^Xtz%ZsI)!iy|4vxZF{Gty zzvPB!r^0glVW;26Bh&0bbwDMFHhm0Lno-Vjfh9DjLllA!Fuhpe3~)-hP9i8jLMaH! zBdnrQWlQ-cBI2??pt^G^f+#>BjATG21}PaR50Q$qAVZL_{wzzawq8+|Wua2YAfyK> zmD2NVrCOHy0IR<>LK)b~DT<(}VMuk0k_hdL%AuFDYHtW_W%eO)C_Kt;>5_;WYd_+qBrWGAmTPM`k$+#wD zO`&g`7L4SGy8PgZ6wgWVpT;$_RIf<)Gb%czwkG1QKs@3q$}g+c2X5xTH0P6PM#cwm z>10|Y`UWw3)I$>)rP0(l11la>L zg(K|{aUA)OE%Q*#?oZ$zfmVhQH8-gy+X=+tOB3Z@!qi;>488e#?)_<+nMSuOm>yqnTW0D3gV*8qFND#t|F0hBK4+f6|&j zIEA;N%$Rk?%4V{e6V?RMU$aK7lUCOH44!c-kGB)}lHYz7`tGzfmKjBTgUAy$A#+qN zbB4-gneK8KRK3%{tMg@aqBk&!9YPs9+_G=s(OmK&tAbE|xNh&`(ceRmYFFr0AC{gl zr%TnBY4%;JzCy6SR0TX8QI}w#ZbBEsG(D{VvcNWg)?*m4FiMSu2aD8LcrZs_5>pS_ zPRu(Rq9-H;AD(2SdP-57qml_pKT5U!8FuRm0zs%s!_}~NfJVC8s$eVFur*v5KmiP) z7IsIci7jU@E!a_DyJ4jc>MS2Rlc>Vyu>Elm9-$>ozg3QWOgHSInlA;o2QcQOfV`Uwf> z0otLeD3C-@GhqHR>N3;-HXB)Ll9Z^$At4JRLN0{1#3i!oGFgPl5H=fU45-U!V_9h7 zqP~b86wiM&Jv04|JN@ze^jdknv|e0azkhzcSP0#nJ!gJ(ZwE6Z!Fo|cIh;G=aFos| z1``Mh#KJykOJS>^B#| z{WDakDWfWL+6XO2$7cbLeg^@C6O)CAr7jaWEJ2PpV^KDFNKB9-tAHZCiJC$c&z&OK zjEiP-K4TO2hA*-Rk|Fc+kPP9)W`SaYb&@&w3&tt%Dno6VZe4C)nT6j*1Y4KvS$wDv z5sq3+`zcP3v9^pgXUzVmi)LYdJW+IjJ_*=yTTo=!^{5rU;Os`;*o1*qW9GrMT9$n& zgcQ!4n%il>5k)5*mXi_}v>IJoQ@ud!N)Wmpc51Ez_>A`9jhi!!GoPEjau%h|LN*0j z4`QZBpxNA%Qs*{g;Goss?iUY24fMDi1t3xFZba@?gU_)Xlk6rw zA;;|F;Vj?J!}mv4$11#Z_=^6Fx^z6ZOEUm1oL3{wpHu!Lt>UJ4Yuq=B({{gy@8cE)6+k=x9>+0H7 z-?(eTuDt_qr}+Hr4Oe?aVafn~q}U(n$HwB)Hi^9ry=uE~R&q+UU6B2w&)M)=Hjvbi zj}akwRfs*I@1_+Ah$cYFWz=WQTmcat2_#`tm>q#ZO>zbWKBu-ZGVzxzI%Iu4{}9?6+~!8rz4CX6Ydq@kVDZ~|890`d*7<$M7poX;cZDFBfN(fK0839yJ<^u**a5|TqZ8yjWQ zqaWc#A4Q;sPrvb4R}>xQW4UGt7|>JUAWwf-@`Wd(v& zgvk*+Sv>kvbmCL&IoW>}V}06&uSPLJ1n_HhCu1#hAjgV*iSgG^K*HSe9k zM1(jngE=L>BivIK>sj?XLZayT9#!A5;uAfhBPs`)4$u<{ zpC*=Z3x|N>R@)y^yJc#j^T8-xlxnnZ3utJv$bSG;No*rz|Y1YIkh7C4Y52`pSs|G;b3ap$4 z!2AMHm=Mb--0wEd4?{tDLUvFMhn+wU61 zE^1%X)`S^#77P_G_e~z&r6n~5xhPvd3fk3RrzNVl7Bm_GySc3;55^T8F_lF0DSyj& zr1=zYNS1{XVR`TyBc!I#iXUgr1|7*8*g41~49R8fvTt5Y-^;%FC-x4{Gcf)Hn@JS> zr;rBt5{Gvgc9w?GKYz2PHU`wiu#1$0=K_ol;u$%j*s9ZX!Pb2oVLh<~U&lT2- z9~sjaHuC-R=RTReaB=^P_yiA3KSv=a8-M|lav?2!MW4mXh3+{^&06pxp z=gZ00n_K{>4lW?8fxQRoYC>F(Lk$?DUjN*mdp!|yVBDW)-ldH63rS{gnKN~!ojHF2Ecg*Sh%JxdBQ}~bg)EV{qQtGG-AU|(AyRePMGt%fY>kDF^zkd zrXS&7is<-of@T8Efuikh1a4R@>R(5Zqyp#;R*{dZ;Op!@?2cOP-A^v=J0y;aqE}=$ z;c7;sp%Zr6D`1;z(%Ro2AJ9K@XGJ|_3iO@lQxm<< zujzjF%y~YJ&EcK`8fN4S0Txo0B$l_}1{eWeJ;wRKAddw^en;``FYJ0}%Ywk4A_CF@ zdILZJFcMSx9KIHW2YemAMxt}#WCx5G1jaXI9P64gIAa&YLsnRq#02JuPvD@;Hb94V zaQ>c@W;R9{`xv-s?X3=vC5bv@ox0Pe=`Y6~vZ?7lO6{x-oLzYE&0z0sxRIFu;-M6G z0_khi(Kr`L&uocR=0tO`KvT*92Agm&uvmIhrX}uq*~B8x}il@)Da|os+ z?C~ny_A&CY|NorlgXW@-F|Nb!lB*a)oy{2{ zhK>K=Z;}j*bNq`PxoOgn=KV%iBhV-p%g zFjp`@Hb@@et87JiO~%gx*Bs}rgX^!@#0Demrmr>BY~GOfXTXAJZ{hOP(GF~M> zi>#>9Y{x3NE$-sKHz6!#vyWeeMG}b7XBow$()B`od7!@&fvr;JC&Kr#HT#( zAy;&1pTd+)A(k1xeK7%igc>H34KQRK&*cUMKAo60QN-nkn?O_`XEs)W&~~8v$yIOa zKOCkf`p;-S?kn9vARdSG-cPI}I$W{TS5X8b$xAuWC2+WtY0@;r>P zUm<9~8N)|V4)&mdEMQGs0cBvuE_2*Eg~1A59=7TO;f=jpm!hFV`Q z9Jp~*gj@BDP!ZZU&uIZ(4{^H6HLgV?h!-#(bG3+cwkMZ8+rrd!-V*S6e;><5Wy8e%@Jw16(t^I=t`ma1oSKyQDZpn446=;tYxzc>cT((F#AyGj% zp^b=V+#-e(TH*?kyMUl2;Dm63WKl@ZA&_kfCuEA|Mq%31P5g})oMvdxo__empSDS1 z!6CNFM|cK>vidCBj7Iwl;j!^Hc+tH!P9TlJqKt8vLDg(mI&c$_n0jXDg@mDu=_c}j7?+i3?2E-1R0}l`qP?u`i9B{nYq>G;i0?>n`-{tHZ^ZYp6 zkVYZD#}3Rh5FPkOjQt6MUgHuwj7k1ORP*hm&7pxIE0-0&!*l+;t1y-JLTt`8zRKZb zmoW;x_;dN^L@;2A@gFT|M|8mrW{)691mF2CzoKhREY$|?m6OOT=eHQpF)Ti-U}Fnh zQEo^(=&LdgF(Lo5N`J_Lte2a2!PTC_VZHe5NS&9>Mei#dxu${|!fm%_{Tt7W4jel& RadYBNCtjN<Ny{u_J^@38;? From 805f0f084d9365bdf62a966270976125d84302b2 Mon Sep 17 00:00:00 2001 From: Christian Panse Date: Wed, 8 Mar 2017 09:02:38 +0100 Subject: [PATCH 5/8] Delete __init__.pyc --- fgcz/__init__.pyc | Bin 222 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fgcz/__init__.pyc diff --git a/fgcz/__init__.pyc b/fgcz/__init__.pyc deleted file mode 100644 index adcdf471bc1c6672e44a3bf23d46a0c31eba7d86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmZSn%*%CT!;A1_1}Io+sZUE!t_lLu3_&108Xy*e zDAomX^+StOi;DG=3-sgTlQUA2v-3+!iuD63-Q1m{^g-Hz;+c7wCGqik1(hWnKpi%@ S`6;D2sdgX}i$UHHU<3dL)h#9f From d0cd25c3900050c5bc51c984e9ded35747e60594 Mon Sep 17 00:00:00 2001 From: Christian Panse Date: Wed, 8 Mar 2017 09:25:53 +0100 Subject: [PATCH 6/8] added cmd file --- fgcz/fcc.py | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fgcz/fcc.py b/fgcz/fcc.py index 8e774a2..97bfb5e 100644 --- a/fgcz/fcc.py +++ b/fgcz/fcc.py @@ -480,11 +480,17 @@ def process(self, file): if not candCmdLineMD5 in self.processedCmdMD5Dict: self.processedCmdMD5Dict[candCmdLineMD5] = candCmdLine + update_processedCmdMD5Dict() if self.parameters['exec']: self.pool.map_async(myExecWorker0, [ candCmdLine ], callback=lambda i: logger.info("callback {0}".format(i))) logger.info("added|cmd='{}' to pool".format(candCmdLine)) + def update_processedCmdMD5Dict(self, filename = r'C:\FGCZ\fcc\processedCmd.txt'): + os.rename(filename, "{}.bak".format(filename)) + with open(filename,"w") as f: + for cl in processedCmdMD5Dict.keys: + f.write("{}\n".format(cl)) def run(self): """ diff --git a/setup.py b/setup.py index f244624..6574927 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def readme(): setup(name='PyFGCZ', - version='0.5.8', + version='0.5.9', description="PyFGCZ contains BioBeamer and FCC python code.", long_description=readme(), classifiers=[ From bd09cb525ef1562ab7d1afa428ffaceb747b188d Mon Sep 17 00:00:00 2001 From: cpanse Date: Wed, 8 Mar 2017 12:22:02 +0100 Subject: [PATCH 7/8] try except --- fgcz/fcc.py | 24 ++++++++++++++++-------- setup.py | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/fgcz/fcc.py b/fgcz/fcc.py index 97bfb5e..ed5d119 100644 --- a/fgcz/fcc.py +++ b/fgcz/fcc.py @@ -340,7 +340,7 @@ def matchFileToRules(fileDetails, rulesList, myHostname = None): rule["converterDir"]) + " is already in the path.") continue matchedRules.append(rule) - print rule + # print rule except: pass return matchedRules @@ -421,6 +421,20 @@ def read_config(self, url=''): logger.error("could not parse xml configuration") return None + """ + write all considered cmds into a file + """ + def update_processed_cmd(self, filename = r'C:\FGCZ\fcc\processedCmd.txt'): + if self.parameters['exec']: + try: + os.rename(filename, "{}.bak".format(filename)) + except: + pass + with open(filename,"w") as f: + for cl in processedCmdMD5Dict.keys: + f.write("{}\n".format(cl)) + + def process(self, file): """ computes a match and executes cmd (add to spool dir) @@ -480,18 +494,12 @@ def process(self, file): if not candCmdLineMD5 in self.processedCmdMD5Dict: self.processedCmdMD5Dict[candCmdLineMD5] = candCmdLine - update_processedCmdMD5Dict() + self.update_processed_cmd() if self.parameters['exec']: self.pool.map_async(myExecWorker0, [ candCmdLine ], callback=lambda i: logger.info("callback {0}".format(i))) logger.info("added|cmd='{}' to pool".format(candCmdLine)) - def update_processedCmdMD5Dict(self, filename = r'C:\FGCZ\fcc\processedCmd.txt'): - os.rename(filename, "{}.bak".format(filename)) - with open(filename,"w") as f: - for cl in processedCmdMD5Dict.keys: - f.write("{}\n".format(cl)) - def run(self): """ diff --git a/setup.py b/setup.py index 6574927..8be52a6 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def readme(): setup(name='PyFGCZ', - version='0.5.9', + version='0.5.14', description="PyFGCZ contains BioBeamer and FCC python code.", long_description=readme(), classifiers=[ @@ -34,7 +34,7 @@ def readme(): packages=['fgcz'], install_requires=[ 'PyYAML>=3', - 'lxml==3.6.0' ], + 'lxml>=3.4.2' ], scripts=[ 'fgcz/scripts/fgcz_biobeamer.py', 'fgcz/scripts/fgcz_fcc_run_linux.py', From 743c9f3806ea77898d50f197c57c2ce4d20c9a23 Mon Sep 17 00:00:00 2001 From: cpanse Date: Wed, 8 Mar 2017 12:44:44 +0100 Subject: [PATCH 8/8] 0.5.18 --- fgcz/fcc.py | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fgcz/fcc.py b/fgcz/fcc.py index ed5d119..b21b825 100644 --- a/fgcz/fcc.py +++ b/fgcz/fcc.py @@ -98,6 +98,7 @@ import logging import logging.handlers import hashlib +import yaml def create_logger(name="fcc", address=("130.60.81.148", 514)): @@ -424,15 +425,14 @@ def read_config(self, url=''): """ write all considered cmds into a file """ - def update_processed_cmd(self, filename = r'C:\FGCZ\fcc\processedCmd.txt'): + def update_processed_cmd(self, filename = r'C:\FGCZ\fcc\cmds_conducted.yaml'): if self.parameters['exec']: try: os.rename(filename, "{}.bak".format(filename)) except: pass - with open(filename,"w") as f: - for cl in processedCmdMD5Dict.keys: - f.write("{}\n".format(cl)) + with open(filename, "w") as f: + yaml.dump(self.processedCmdMD5Dict, f, default_flow_style=False) def process(self, file): diff --git a/setup.py b/setup.py index 8be52a6..74d8119 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def readme(): setup(name='PyFGCZ', - version='0.5.14', + version='0.5.18', description="PyFGCZ contains BioBeamer and FCC python code.", long_description=readme(), classifiers=[