From 5890b3f06af75923efb8d9ffad6c34ecc09c41e4 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 24 Aug 2022 13:01:35 -0600 Subject: [PATCH] Clean up --- app/__pycache__/__init__.cpython-38.pyc | Bin 156 -> 0 bytes app/__pycache__/__init__.cpython-39.pyc | Bin 156 -> 0 bytes app/__pycache__/build_containers.cpython-38.pyc | Bin 1430 -> 0 bytes app/__pycache__/build_containers.cpython-39.pyc | Bin 2019 -> 0 bytes app/__pycache__/deploy_system.cpython-38.pyc | Bin 1396 -> 0 bytes app/__pycache__/deploy_system.cpython-39.pyc | Bin 2143 -> 0 bytes .../setup_repositories.cpython-38.pyc | Bin 2908 -> 0 bytes .../setup_repositories.cpython-39.pyc | Bin 3413 -> 0 bytes app/deploy_system.py | 2 +- app/setup_repositories.py | 8 ++++---- cli.py | 6 +++--- 11 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 app/__pycache__/__init__.cpython-38.pyc delete mode 100644 app/__pycache__/__init__.cpython-39.pyc delete mode 100644 app/__pycache__/build_containers.cpython-38.pyc delete mode 100644 app/__pycache__/build_containers.cpython-39.pyc delete mode 100644 app/__pycache__/deploy_system.cpython-38.pyc delete mode 100644 app/__pycache__/deploy_system.cpython-39.pyc delete mode 100644 app/__pycache__/setup_repositories.cpython-38.pyc delete mode 100644 app/__pycache__/setup_repositories.cpython-39.pyc diff --git a/app/__pycache__/__init__.cpython-38.pyc b/app/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 42da53cc51514f858c06c228f7ea339563e13285..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmWIL<>g`kg5t+4$sqbMh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6vJKO;XkRX-)M zEHg#FpeR2pHMyi%zpOMTIWaG@DpkL@Br!Q#H@_%3Bel4sD6u5JNI$WlKtDb{GcU6w ZK3=b&@)n0pZhlH>PO2Tq=+8jR000|bCNuy5 diff --git a/app/__pycache__/__init__.cpython-39.pyc b/app/__pycache__/__init__.cpython-39.pyc deleted file mode 100644 index 00879fd41006b78d25492d2a0250fb9cf4c0adc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmYe~<>g`kg5t+4$sqbMh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6vJKO;XkRX-)M zEHg#FpeR2pHMyi%zpOMTIWaG@DpkL@Br!Q#H@_%3Bel4sD6u5JNI$WlKtDb{GcU6w ZK3=b&@)n0pZhlH>PO2Tq=+8jR001JdCO`lH diff --git a/app/__pycache__/build_containers.cpython-38.pyc b/app/__pycache__/build_containers.cpython-38.pyc deleted file mode 100644 index 0a58c334d39649cd122c7028c5ace90300cf20a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1430 zcmZWp&2J+$6t_K}nI_%c><8sTC_+dmXq%k4psK*OJ?y1G3IdIUMw7AIOm;FeYdcXo zO1QLAQ;8LK&`JrnmH3N%<+T4oPdq#QV1-A1_WSVj@BREVKQ&xuMJ4rME)N9s1Ow_BlGkXE^jI zK0z5YF(uS` zMOOF{Er{5a9<>+fPxP9cVT??azd$Q2df;)4tw!B5{CjhbXLuQ`&~jsi=Hw^z1^OQK z(9dXL@pFjvX5=Qz1-if&7+CR=Qp3i-5^a2CrnKdH8WHW{ZmHKq;p6SJs@siN+nZhPKVaDtI}%^4?q1>T z$~Q_!3@ZO9;b|##=mF;if7%i^hRt_rd#iiv2d>L+6Xl2j%Q9uLd{S-nn1F{c^tS`$ zlswI)B85p(^uJ60WB|7D)dTa6XHnf1> z3sM1_mT-D380SP=_3uYHseo=*c2Tli+0fn;I4!eOX3*TC?Iuq6F$=711%nF@gWH1U4w3eB0dIzY#+l11woOd4!Zz9G5h8{AM;NkqFr0Vz7Kol z$NZ#>xnRntEGfoi#@6tg+Uq1)n!GTlRK1LaFm$r1T;nicj4)vQol!x@8QXmi&I+C0 NV8MU_`wbTe{})e%hSmT8 diff --git a/app/__pycache__/build_containers.cpython-39.pyc b/app/__pycache__/build_containers.cpython-39.pyc deleted file mode 100644 index 5e544127cf7bf8921bd8c7d3b7c19c3e570c7ff8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2019 zcmZWq&5zSY6rUM?#G8-Z1xgDlYNuQvh$OAl3uuMP$4ccw(Nd`*QWbeUlf+raV`j!- zV`Y0;B$i4`Z#}f4+VsY~e@hR(_Qb!yq3WASHc(;9FMc0>^XB({ZxS{dRRq_szj@K$ zHH7{#%KMiG$~W++KR__VaDuvvU);r3CtU)+Byq-W*ToB;*Y&K=@A{mKD$HRn^NvY3 z;K68(`K-bMws!1bWc4cOwfFQo=#BUEbz<8fu5Fjzbd{ zCd(v6z150_JlboCG?^AR5+U{!4K;l_4D}UwOJGShH5f`x!<11Qt!Uh*v8Idgfe_48 z&E&Kt^R&3VSd|I*V5)}z(seq@)oC539{~3lvH={h4t*+e=+iEze4j_T<}5O;JiT0a z3E*+yQGbEZXoO!7kmLo{&d5FSw9haj%sD1={KEK&`dU|*dxU;RugD?B$i@XnXpYsl z;PI>t$asi-lxIIAM&U2XfXm8~B1PjKpU@p4pkqL$ z;+j#VQ5o(ubVaIv_sB6uqvhXdY9z~9#Ux~K!8m(;&WBMc~> zUIx|*Jm=t1FF_n(bymZy&)$KDN94p|1YmN_G|vh1=FR~IFt#Ale+Py(k=_gg%)8*R zFtOm31w#8L6}C1v&46=2{j95_+6=QQs~w>jv-+`f08M3$899a40=NF4sNOMy3>ySE zHr{Q~j`v&Kd5c>`V3oES7QrJsQ6_X-N+GY)#fX7n{r|wdF)(~D4Yy!~JO#6pln%^s zQQP4Prqwo}SuZ_1KqV2XbhA(oOLrvVw5&*;C1J#2a!nsp>8L40fTBw`lmi7lmD3)K z1PpS%3uj5h6-0rd>6B}$jdai3;(Load;K`!X*lNH`ob)2Ew7!j!T6+Sn9#FDcy`9i z%JQ&yjo#kx48@ptSO{lU2bLQFT~ue1CsCNj1@G9ittBMPu+lOFDs{pv>nxU8m806( zv^=w{wzo2G8Gd{W0$~@g;|o^S@g}ZfpL|4$%gdQ=ZzUoM6LqWoL5gNwegfai&yD!Z zh)pBTfGDecKZ6q?S6oVBtQ*Ga#R^zox+3Fg>6)_$pv;n3Cvb|ZrrSNYs;_6bZo%tT zS4Jf-n_Qn7L5;X%#1|mS%Cg=jD9V@-@$F80yiV#kAXR*gz)s2LMu6p2@HZQade6gq z89;+GIPQ5FFdm5<{yi3TUo>7XO5$j*T)!;``Ix8rp^22GZ@-XbJ!Gs039PTITC363 u0w1&3qFlOqvo!}>W5M!--!d>N;|#F5pRi!4Kw&5%bCxVi3Q1qi zhP3pu2Hmm*0qm{)XZiw(`=$0YZNp z<0>!%##~5@{kcAUF*kDdU7jEp@IWD}|W0bkCQS5VX6KoOp@*eY; z{~F!k8yp7=KSiV9AFzwgM_7AlRldkBVHQ2A(m5ArMaD~&5<}>k@y3CE23kQE;2Qu8cR(RaVg`d<4lW8syOP1R{H}96W|Yz$Fpj|$1J(Z*tix| z&Qm4FSIZ(z%52TYQYGp9q!Q_jOC=IjiE&cbW5(;ET219jD!w?aSNhKFQMZS{hID?< z#A65o;Ui3Oh$9?WDI&m9Y*xC~hp`9Uh7iF@gL0JP7Tb}SAc0O=M>!1A^xI)e8@i!e zv~jnnb$>?p(T`|?o|{n0*r{?0rMO07E^=9W5FBT_E@hC8%KU@ zLKZ^8{{rrx!0j6!nqIz_@3V*v-hftq37kFPd<4$Fz}dg$Y=&F-d7J9t`FaSMg$Roi zlfYATt=30pJLEX67IjrZAwRWR^rX{I*7S6>DAxTSY>i~)<-_B({~{|m z?1G9ObiApBVmgClYqG4@hm&Pl0)2Ok5okk$I3Y-b znm+7CYhx6O&%uBW;JVg{fG`D&r`579xG?WaJgir0R+UruUd<9nn+=0@(;`dfyPz3g sbW|r&PT{3e{91kDt@Ycutb=bB63lDtz4}(r_>Hq)$ diff --git a/app/__pycache__/deploy_system.cpython-39.pyc b/app/__pycache__/deploy_system.cpython-39.pyc deleted file mode 100644 index 82705c0df61e1e343be1f604c42d9f7d85c30edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2143 zcmZuy&5zqe6!+MU<9zLAKU#L%1>6IwQf-=o1QIKRC@np%5ERi`LXqp4O`JF$cV@h8 zEH9Vsbw%%0r3CfD|HH{wxb)7c7kF>tpcTT&JkNXcKIXld-*eFEG!1xuc;tj{+J^B5 zGMAq^Fkiute*vKeC9&bJ-oz)so3S~we2bvWitSm=ujx679p9lgt-Ub(IwKR8I<$U4 z{03`Gn$%@2+87zM`75C<+P(lAE$`3`x=Fhi;7{{gz;9pTcYxo$#9sma>Y87)mxkYA z9q|7i_}`=Z+7I&AfWKbxjl~A&ZL-Zt*Y5(|^0(MFJvb*2(^>2+4f;NHUl`}a-=XAt zqxZpE$lN&Yk;!H|!D6l4OmnVMn`W>7Jl zq2EewiO+DhFsZpDXJ%m(=Bc4qQP&a=(W+XtVAVPWTM8OI>-gb2a@e!VdX$85Mp;>B z&sUS0OyfxP?2^dR4#Y_M?Mi1DM^gFiN>Ova83M1sy9a|YpRoZAP9r)<1)s1`$-!wB zhd~nMY#>z-PWxPhVXaO$U^vF`p0RTq-uZozBZE>rm?;U=U9CupV6?2H7Px zX_7W^H5G8{jC_CP##3YFg?yIAOfgSKgle}alc9)G74f93!}2Uh=vxAIkiD6urA_&> zq%>2R?^dfvUYex^ii=c2A#62ISy@Z47~o>eqmV&u#w`@_uT}7oF4CZPaC8I-clF9Wxs*+;OBsj)kJd3IKgn8^a3p2&Ex9YU=gOxX^y->Ih z$R7`cCvekc&lEe5@hWZDLUq*nbxa4(>wj!=`!WCIMhIsAKG;-T7#bul9HfHAa!!6Z zI5P@kL6!iArEx}ngo|#&?;P4e(*4+wx9%83{~iNXmUy6SY8K>`@!CZAjtl@0xo`aR z^_it=g{7QxQ~a#z6L-;|7PSlOl|gH-t)+Qp7v`c_*h{c_daPRV7(6++zVZYzOS}PD zy)f4@)hj@1YrLOR=4){w0H7@N5 zj}kys3NC0_(@+xFL&XLv*5RHH;hu|q6yZ+wR(f@RtE!Z4V>%t*twd5>14X}Hv7m}~ zSTe0OOoADMuahpD4x&5YinK5Q2L2R=yaU9rn&g&glMUO}J?koI1J^}~)ij$RbD^WT zqznBF-@RRN1FT9HnoSxAXe%ydA1aoyYzLGM!LME`Eoj8$0g7gs%7Qqa4>gQsbjpS!0U^uU>ebZtXeo91 z#fPvF@evXa2_}502>3w|Sc%g8V#a9}voE)SlZQYs-8Qyw({0+s{M)hiAobM`i_kS) J(;<$g{{RPmRf_-s diff --git a/app/__pycache__/setup_repositories.cpython-38.pyc b/app/__pycache__/setup_repositories.cpython-38.pyc deleted file mode 100644 index 37c8fa4fd023ac3bf9f69e94fd562465a240f3ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2908 zcmY*b&5qp05$-0NKg;=%yjly9<2Zy7$C^aDgCs}}f?x=-Y$J#;c2;ui5C{k^yJwfP z9FpqpS?m%sx$FWv0wP3*+zbOVx#^N;$RQ7qTMS-vQXU`&U!1C*S!+y!&FbpvVpr8y zRs6Km2?$*O9=qv(uMzSeoNQh$Ozy*@p2NTir#XpMZyHfEw;~JPR&I}3#OP|xi5%eB zxjS|vcg^!6?<2w)cPmMe^bxud?5Q5;@BkPh3DW}}J@FSah z+~Mv8jo2k&ByvEz-?To;^e3`BltQVLZs)P@*kV3Ag>so|4$+ z1XQs>Lx26aXGd&OWV&$@m1bEK;3QUQl8YW|95tzgZ2UORkR3}@-mvN*k!Y3@`S1m8 zw&FO=6Q$z#1^N27{iAX$`aC(wc)yb6NTgczPbPVq6j?3$N+;>@ZYk3vp|nhNDf>xP z^_9?*Dwd)uRR+9FsJ-e;`tZ3o(H;f^p#iOTHq76JUS z$?2N(#t@I>P{X6ipagXJRmUK$W#A-0Z}oc zPnmgJPo4GK(qQYt(XL4!`aEt0EntHrNuZL%5og4aw1a^`42w$eZ2qi$B%3GPyJNLRQ?dWRd*hU zlW@N*b(pEUVf_=FN}NKZA>B)P7V=W4;$0nz(@g0*VJbzUv*NJ6@$HGuc5_(T)2F)j z3>xl+-vJ~B2^0ASJnA-7Hx6J#=gi=}0N5=lw{MY|r2(J|dk)FHv}U%Mv8lbJGX|mH zQzjpBrk#b0ype|*3X3~42iy(3F9q*u21RIp0npvUfSCdEU9@TR|N6)oz#-0Ok6I*|S=>+SGdunpc%WA+ky(v4=El zRAxovWC~C!ZvjWX0YlVTxgcJ-pm8b*T1{1HY)FZQ0faTSgK?>aYFubehoFby8BH0D z0`ut@6Q}1j46Tk{AHp)$Er@_AT``uo$j8M2)b{9>5g2Bd2gcrK;PJ}!t)w(&EstS6` z6k3+~>_d=Mzk&fB4 zkCS5o5raUKl>omZe4D_;HqQ#7z~y$TPh}sspw-dNE8N9cV`B7jfBf zQpO|R+6X+QdK(7fVXOA79m}O%3ti&VzzXP1FurTueA}n;9!T}ND|324H$I%cN~D6) z$p!o*KxH*%t?-8Zrg73dOOK=Oz5&!HYv3Cs8Ppl20JBPGWzn=N{ISC1!uY@H?S?Yv e_V2C!5Z*I|5+QAl4Kaj9569mQ{I&}e8t{L8c>?PI diff --git a/app/__pycache__/setup_repositories.cpython-39.pyc b/app/__pycache__/setup_repositories.cpython-39.pyc deleted file mode 100644 index f21b25d80e27a3db2aab9e43bbe028e365d3be3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3413 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 C*{f&( diff --git a/app/deploy_system.py b/app/deploy_system.py index b45905d2..020fb671 100644 --- a/app/deploy_system.py +++ b/app/deploy_system.py @@ -34,7 +34,7 @@ def include_exclude_check(s, include, exclude): @click.command() @click.option('--include', help="only start these components") @click.option('--exclude', help="don\'t start these components") -@click.argument('command' help="command: up|down|ps") +@click.argument('command') # help: command: up|down|ps @click.pass_context def command(ctx, include, exclude, command): '''deploy a stack''' diff --git a/app/setup_repositories.py b/app/setup_repositories.py index 9eb2ab69..a93a3e2a 100644 --- a/app/setup_repositories.py +++ b/app/setup_repositories.py @@ -47,19 +47,19 @@ def is_git_repo(path): # ) @click.command() -@click.option('--check-only', default=False) -@click.option('--pull', default=False) +@click.option('--check-only', is_flag=True, default=False) +@click.option('--pull', is_flag=True, default=False) @click.pass_context def command(ctx, check_only, pull): '''git clone the set of repositories required to build the complete system from source''' quiet = ctx.obj.quiet verbose = ctx.obj.verbose - dry_run = ctx.obj.verbose + dry_run = ctx.obj.dry_run dev_root_path = os.path.expanduser(config("DEV_ROOT", default="~/cerc")) - if not args.quiet: + if not quiet: print(f'Dev Root is: {dev_root_path}') if not os.path.isdir(dev_root_path): diff --git a/cli.py b/cli.py index dda2b4a5..057ce1a3 100644 --- a/cli.py +++ b/cli.py @@ -28,9 +28,9 @@ class Options(object): self.dry_run = dry_run @click.group(context_settings=CONTEXT_SETTINGS) -@click.option('--quiet', default=False) -@click.option('--verbose', default=False) -@click.option('--dry-run', default=False) +@click.option('--quiet', is_flag=True, default=False) +@click.option('--verbose', is_flag=True, default=False) +@click.option('--dry-run', is_flag=True, default=False) # See: https://click.palletsprojects.com/en/8.1.x/complex/#building-a-git-clone @click.pass_context def cli(ctx, quiet, verbose, dry_run):