From 05ef06ba8863e9d2d1358e2a20598795de70ca09 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Wed, 10 May 2023 11:28:28 -0300 Subject: [PATCH] [Tests] Changed spec_to_field_1 - No more KitSpace --- .../dpn_1276-1131-1-ND_US_en_USD_US.dat | Bin 0 -> 3539 bytes ...dpn_CR0603-JW-102ELFCT-ND_US_en_USD_US.dat | Bin 0 -> 3380 bytes tests/data/Mouser/mpn_CL10B102KC8NNNC.dat | Bin 0 -> 2005 bytes tests/data/Mouser/mpn_CR0603-JW-102ELF.dat | Bin 0 -> 2903 bytes tests/data/kicost_dk_mou_cache.yaml | 71 ++++++++++++++++++ tests/test_plot/test_kicost.py | 6 +- tests/yaml_samples/spec_to_field_1.kibot.yaml | 8 +- 7 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 tests/data/Digi-Key/dpn_1276-1131-1-ND_US_en_USD_US.dat create mode 100644 tests/data/Digi-Key/dpn_CR0603-JW-102ELFCT-ND_US_en_USD_US.dat create mode 100644 tests/data/Mouser/mpn_CL10B102KC8NNNC.dat create mode 100644 tests/data/Mouser/mpn_CR0603-JW-102ELF.dat create mode 100644 tests/data/kicost_dk_mou_cache.yaml diff --git a/tests/data/Digi-Key/dpn_1276-1131-1-ND_US_en_USD_US.dat b/tests/data/Digi-Key/dpn_1276-1131-1-ND_US_en_USD_US.dat new file mode 100644 index 0000000000000000000000000000000000000000..598c6072b1ae989f869805c6f5bcdcb8c061359f GIT binary patch literal 3539 zcmbVPOK==l6_xyn9XWCAMEQ|lcf8jYNoL>^hPBdM)u6uAML&Qtf(bTj?C z{kkQMLnjVkLVyrR2oUp0AP_za3Kmq6t*I0Xwouu?B2+<96_!ve$bx%c_h_W@&MH-D z=DmB*efQk2F72{9t`&;JwB5Gb;a!tOuDM<-<8Ks)c4{SVuolKXOWZIh`=QM}(YrBi zo-o%FLyNiObnz7iMxKMg40e@_0|NsCrr$NA*tOiC4ZC&YMmh>tMd2B zWv1r_9RYiF<1n3xgatN>Z8Kt4hqXD}P+WMf?PII}AS&Vs5yJ)4#o2H-_jo4jo~NbXCBIbmJB}5ox>41wqNJxyCu%JBwHHCl`u2!zl2zHI9k5&P^Mi1ovH&4@EZJe*qpST~CxK9l5!R z);gHH`1z##2nvSg!xP>Ogn`Bkqkasavq!;a!~V)zdtqg!o<9Tf`7jMcTc>3`GLM*DT5Ibtdii% z$4CCqee1U*_^*ra&Hifm>Av8{GWa+N+9demKd$`g*dwo#;D67T{&V%E^L@c%8H}Rf z!oLSe^76UixBuvzLCMF4-yJ#;z4>lmvYbJMB>%aaBrm=5zV`6n$|R{Uw0-eCDarFH zi$jwVAYn-=K$W~Loju*EDb3K2JQt}0EvLrg3{xT(tm-+F5sR6ReIOQ4y8vU?7fjbS z*Ij#P(Y06b4~!$t^$aFT`2)91n63?txqW#ZAWQk4@<#C*?OpT zJ!0H|f_d)335nfI6J?o2Tq!k|N8l4Vfn@&C3?3^vjk(>oQ%(-KjGZrL zfyLpZb3*ojtH06IqtNW@PiJt7^!K1XJx_xfRHk~HM-r7*()BpZqBdQQ!s))|nG7B$ z&ArZ~Lpsz0W;g~X<^txN6V5i-`3x3F_8?lJ_F12-S0_P7Evn;{&`YobDWl2~^#wSK z=A*L@0*}l-gu_akJGe8MclW`VN>n>>6H!Ko=46HD-^ zKH8@aUy1Gm2KF z58(E3Kbt`ZaTi`4EP!j{>R6)&9s<)io{F$^EjjZA_yyi950G_FSxn<7#8?J>yfA}^ z@IF91nRWz{rz*~Fsvg*xdT|DV6n?*}P}qkGm}e*|AlWIKX0T4Of9d5kxqh0vZ70Fx z#Mz43sgxGj<_K);)ZEOVOPYU0O&NO3It?zOlf=)m<65173sERPUHD1i9zUX#)bgZ^ z@#p$}W*Iy~fdA_~h5Ves9f(qq$^@R>`GQLsJVy%e?86sOv8wQSG*4^MB8wBOWZ5^r zfTk(Yr{vUwFZL~7&frS~Ft{H9h$Kx_RVA8%=L?u7BZhHP!hZ5)gxN0hg2dr@`z_|W znZ_P`#W;^pPLf38c%`zju~9D8zp@qj6&_T2OF$)G@hXD(A`RN3+{3{fhoe5X92U5i zs5Iv_^`xd&=b8;&*PE4Eqfwt|Ou|=Xozo=rS=^;T&V<8x0$(#)+id%^_wBGA*=v<) zls;NjTcjW=t=u>sEKbi{W6^9y+$y6MyeK=)mdVHolMueH?>xmx!9#dSmqg*J7Q5IO zzo8p<;iF8S1u51eb(Ywa^J;^0+(^G!tU^2PBkYcn&6kVCr^j$H<6hYw(r@Ma4ec|g z$8g_XO}i#>h+%tGFP1P52O(}|yjXatZoXY?Pk9`;jXO7Oa1m`%@SS4Q&9|n)?00qJ zUh;)+Mq!-D4LA-x(?YAl3{roU$M9M)ew{?50!3^NSBgbAVX?cmw!_T#bmJb$PUs4v z23f;iiTfEYMaa@R_u%`warZR@;w(*i7Js12)@|bI>H4W}hOvzlZ>?58#MMf!lR+5Z zju2WMc)eIKF}-p5CobM7p4ihe**caUTg6%UqsL!){=h)NG5#lG(!Vm>?f+P2fmWTU zk7`;?8`VbjX?Qc|y%)Fb)c!=0*qmBanx~c&D!RoP`m>_obWv!0!B3rs3jVjJ1-zvj z_gzaxx{3|8@9)p_ygasCLANC(@be-W?2Z|E7#y72G#_QWe^DfZNU1*~f3_QAJ({%o L!!LDN?dAUiUT|{X literal 0 HcmV?d00001 diff --git a/tests/data/Digi-Key/dpn_CR0603-JW-102ELFCT-ND_US_en_USD_US.dat b/tests/data/Digi-Key/dpn_CR0603-JW-102ELFCT-ND_US_en_USD_US.dat new file mode 100644 index 0000000000000000000000000000000000000000..f237afa56465c57e7a366a02b23c329df9e1402d GIT binary patch literal 3380 zcmbVPOLrVc754if=V2#y65|9K$AS?=Gd)j9F^Q8%mKDot2}y|>h$(8iYo?3o*X`=o z!=Xb=fFwW&uK)?}KafL~Yz1ssuwV@wa@eq8nH8J^_g1$wa=h~#pW{*0z2B|--RHb~ zz!^vZ-^WsenV4eV3LIuH?*@;XuJ*%RWVC zD&?We6PLx@8SuVW70<1}$$}rBhy9FPKBX^22=^5iPL?DhbhhAr`=HjCfzyR&%9Alm zBXl_n(_{y+{6*-a zVH+~_hPP)edxUP2$Wu&ZT?HSp?0e}%W&OTT1f`G9S@s!i!gVDj5%<|T_cOtILcqgU z@JfFQp+sSWELB93RZF$BSDu0UpeuQzyIa6Ka=3Ux8HoB z^1<(if}hIa(YSyg0YgG^V2<_9Zd`wZdaxaEx>zXj%n9F;94a<((*~Ux&t> z#YnnrUAiMn(tRHPgC?@q%As8;9=L0QNf$cvM~m_(G7C>8?EUC_115_s-IazZEx4pR z3U#E%?IS2yq$FI_*wa~RtnyeGmFd+n_)I|{nSUaOCo5iO{(v{3Yq#DqJ1w~6O=-2I zXhS4MWsRq)8iS|2i<%3wT3>t2sMqS|8azFOdM1Zyf;xy$hv=nkvk5bZMD1}Edt<^w zN5Ex7q3iAU+M_T#RKJqL9H}2hb$WkuqBGT)gl7?es(w~r+!CSSD(c^d2Mdu@bYd(E zh2JQA^Fy?2IV=#`${D2=vh;ei?($56yfbhZo4qyCu1;dVQkRfa_?8<{4E$gk76#d=YI>8(j6IGcabQ z9{?KyeJKY{K>sa)8m-1uvjtrQqL#R*Nx&pD_7DONLQ)?cZ@1BX<0Yf6zkoZ$6*=?} zccFjCoA4$Pjrz2e1zpU)sE25Y?(q0P1%2-#is=4BDeUDSN%aI}4$Vx8bsN5nAQYLE zEXL|am>IE-ZP6%W4+DG@nS@+d@q*O=I~8`iC-*sMha z-?TIzxCA8<8_=tk{Sdx{1w71p+@X?Bm>wA$Lg23VTDfH0av$U7qe*+cTq$;lEXT~Z z_6F|T#pXbp0`oa;vfXTpIi7Bx-?7T|#>ZKNJC7(=NoxFWlzT}*w{UTrrQImjb^YCP zhb;Dy((Id-{V@3=HsdHs^=_F&K6B8jVxcZS_+B{yy;NliMO*>jFIUWzC$iVO#mo;Z z`mw-tyrsxi=UKF+|gou9m|Y&eE~ncy8XtPeI>{E8-dY}guV9P)^{IH z(dpH3YX;sa=-&z7UWR|Bxm>=yVyrC881;E$ac;qAj~0{C(0%6T-i0y@d$R+6VcCz| z&Pdkvr89K$Vb literal 0 HcmV?d00001 diff --git a/tests/data/Mouser/mpn_CL10B102KC8NNNC.dat b/tests/data/Mouser/mpn_CL10B102KC8NNNC.dat new file mode 100644 index 0000000000000000000000000000000000000000..728751a02b65cfcfae4251154fd1b24e82cd9131 GIT binary patch literal 2005 zcmb7_TXWk)6vv&W*YuK>mO_D20ZlQqwj|q%?LsfMoHU6qajYa=E~aecwWUUueWX=` zA2P!e!whfz1pOd9@DX_C6Yw!OyK)jW8JJ-vGtTb*_Ut*U|NrdIr}iP0CTCNr)KU

Nc|~21?zo=ICvbtx<5XTZ$~j$G^%aYc>|L0XV2yHWIgIhGz=MmVh@ivyIDDw8 zdwYA?;V24OkhMocwTEOVNHwP#B|~jCOf#dG^2KtYkRA8>aEV;R-8B~4fjj2z$cM{h z8E2YU1tv3Lfnu_N4qaO@>6qFs$D$PxM#(5vv!+_jO-1*Y@2eSITTpaO+g3=iqv(pZ zsO8~`%y*gExNQ=bFi&PMz6Mvx1^itd(gABz?!dMGs>2mnsD^YHM*cvZ4n-O-c=qLZ z0Pm3V7|o=d4e%tmP9FTvBH)IM&|tK;=?)pZD~E=mDK$C?;imi?4Y$wiiS03qQyzuz zUQ5>3q<+-L8l!*(@IJYPM_X~G%96)y9*i3#StEd_nJ(4u%Bcjf15Q+t;VTz>!yQrw5kHuWL~_hecf z#yt2u+J|)7Ilk=+=U)7!BCc%GF@rCWyMK~}rQrGRkwOKV_bT>po*BuHYgjP%HaVoDGYmIA_o&CD z`~<>B4m9%(eQ_aYLcWH7&?e{ba3Lfi-i=?$oEWaJSW_o= zq?|jW6-zNk!?EY0JisD1kg}oy_8!i99X9r;&4vt@HVLkzU@P{&XqJ{ctO^fo*HdzG z%Xj&6<_;WQAHef{Ao9qgS@`DJakKnZ>MMQ);JXvpy1yRu zu;+Z=g|0kw)$fm*EDS}rgde)_BI)#l!cgZwc7dW9cH$@MXhB-tmL}M;RyHl@#SLkC zB{qwF&SWhmBcIEm-*OuCQ8t6L6Yn%zVyELIDSQ|-aFKd>K&`a}wTqPS`9UlVJcNb^ z&}OBxYJ&e(D2$}R2&wS_RqcpSfRuOy;!tSd0GUuQqAx6&W(znX;_+RobjoFjA{Nmo G%Kiga;yIE4 literal 0 HcmV?d00001 diff --git a/tests/data/Mouser/mpn_CR0603-JW-102ELF.dat b/tests/data/Mouser/mpn_CR0603-JW-102ELF.dat new file mode 100644 index 0000000000000000000000000000000000000000..0230e9a1192efefb4e25478c56144502b241f64e GIT binary patch literal 2903 zcmbuB`E%Pu6vvbFzV8-#PytObM{LQCQ>UdZj-52AW5==&)a?bj_=d0o(1TNkd0kkUBj;H zxE^#@p@;0i=Q7n@gO#Y~Tik5%j7NCLU!R&TuTg|N-1NuQs#~^2U{hW)wy0~l=3Opf^DQ9LB@I0 zI~|M7&(B92j_*-7YB-Hp4M|Usv3M-mA2ZxOEtO0q2DE6iHVfOyHZ;vr&v4BqHys;x zkT|YXm}$%@Bc|0*&~4M>cvGcMDd)3_I-n*LEjKZmFDuDjMT=?bbh=W3ozk%p-9WY# z__~X9<6bK4CR^}#tfALwQRfWykQ6?z;jk$%FE-=&uI=}qoNuQltimuyD! zjLvBtkAi*VFg~vBG3=N8IMr(vvq9ki*@S#5p=9-z2M1-8$IV%4v8DpYJ7Nn1dfn(!p5}W zs0@q-$H;oIf&~K)v18IIFH;xV>^Rwv%s?{Uw`xO$?7>$>*QxmiPjl{?Gd`ytJY0oG zu&5r5$hus9QPA=BCuA;)x-qBMO}h@gvPPGgOS~6Ei*~uUa zK36Jwlfo0oJ-M2D3OSK{c`dnNAA(T<3g0o@c1?F{if~Ao#Hx>>fe1=cRaH=ZDhsse zng$(msXpg{R)siTE)kLEPx`veMYr_lx`Vb7C?w_oC)B8>!oZTFu1jsB1*c>drpj4J zp(le8)}PzTk}|i*tC|L<*$Q(8nWqI)3o+^doDDJOkU5V`{-5qJl!RwOP#U2j0sXZu z3?(2Fg0ct=3utj)7>dJ42)ckl*@qEITb#N!cENHoJs2&>B3demEaj*tLL$b<6|`8R z<2vYAP~fq-a~ zEibjyI5{E~oYAt9aT-m_#Kb8>EoJxyZ3NPjmz7@j>)8LC)=IQ#=>~03n?r%1Z5K=g zU5Wi-md(bHDAi)FOD;~?CZDEeo$*{9CKsS2&tF-E@`ZDM{Q2*l-~Ybt1>p;6?U)@1 zRz;RUAh|HL3Y)Me+!`vur7BFzL&xk{Cr>?3C>D?^JR5Gv_ARj-FIV9?tl2BUKv;Pp zJF+Tkb*emCDZ^E%Mk_$jj?c@xq>_n5TvOGA3NK)t=n)oJW(vY`hJ`7_R4|aLEmLVh z(GChB6=spDx2cOoK{2F6)3#4k!9?g<8_JagG}p1!pxDYns?nw@>C#vR><&sE=pfZ> zQ+Xoxf=&v(2Nx-?O%2HtIZ{IT1GnNT_{dxrj1Y|BOr`+yh=}1joGuLx!VRAy(TcG9 zn2pG_ak3X9xO(8gYYYd=>sZHctk(HAmtkb8ISQSe@P z6uj?KhSGnVjTYD#xr!d%yP63tbEb24LDOO6l9B3-C*wocwfv}&KBZ1B>DdP?x5&mx z51v$T;6qkedk%lZP=y$Z&c`gIGOSWys1%-J;Wvol(mL)Fh0htP%NLlHFWcP`NXb{7 zJtbu0YmE0dZ7PtBZ#yU{8{Z-I{W2wG(^b literal 0 HcmV?d00001 diff --git a/tests/data/kicost_dk_mou_cache.yaml b/tests/data/kicost_dk_mou_cache.yaml new file mode 100644 index 00000000..17d2a383 --- /dev/null +++ b/tests/data/kicost_dk_mou_cache.yaml @@ -0,0 +1,71 @@ +# KiCost configuration file +kicost: + version: 1 + # Cache Time To Live in days, -1 is forever + # Default is 7 + cache_ttl: -1 + # Base directory for the APIs caches + # cache_path: ~/.cache/kicost + + +APIs: + Digi-Key: + # Digi-Key Client ID for a registered APP + client_id: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + # Digi-Key Client Secret for a registered APP + client_secret: XXXXXXXXXXXXXXXX + # Use the sandbox server, doesn't count the usage, but returns old data + # sandbox: false + # Only enabled if the client_id and client_secret are defined + # enable: true + # Directory for the APIs caches + cache_path: ./Digi-Key + Mouser: + # Mouser Part API key + key: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX + # Only enabled if the key is defined + # enable: false + # Directory for the APIs caches + cache_path: ./Mouser + Element14: + # Element14 includes: Farnell, Newark and CPC + # Element14 Product Search API key + # key: XXXXXXXXXXXXXXXXXXXXXXXX + # Only enabled if the key is defined + # enable: false + # Country used for Farnell queries. + # Supported countries: BG,CZ,DK,AT,CH,DE,IE,IL,UK,ES,EE,FI,FR,HU,IT,LT, + # LV,BE,NL,NO,PL,PT,RO,RU,SK,SI,SE,TR,CN,AU,NZ,HK,SG,MY,PH,TH,IN,KR,VN + # farnell_country: UK + # Country used for Newark queries. + # Supported countries: US,CA,MX + # newark_country: US + # Country used for CPC queries. + # Supported countries: UK,IE + # cpc_country: UK + # Directory for the APIs caches + # cache_path: ~/.cache/kicost/Element14 + Octopart: + # Octopart API Key + # key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx + # API level: 3 or 4 + # level: 4 + # The extended API is for the Pro plan + # extended: false + # Only enabled if the key is defined + # enable: false + # Directory for the APIs caches + # cache_path: ~/.cache/kicost/Octopart + TME: + # TME token (anonymous or private) + # token: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + # TME application secret + # app_secret: XXXXXXXXXXXXXXXXXXXX + # Only enabled if the token and app_secret are defined + # enable: false + # Country where we are buying + # country: US + # Language for the texts + # language: EN + # Directory for the APIs caches + # cache_path: ~/.cache/kicost/TME diff --git a/tests/test_plot/test_kicost.py b/tests/test_plot/test_kicost.py index 2ad6b77d..2b499322 100644 --- a/tests/test_plot/test_kicost.py +++ b/tests/test_plot/test_kicost.py @@ -134,7 +134,7 @@ def test_kicost_spec_to_field_1(test_dir): ctx.run(kicost=True, extra_debug=True) output = prj+'-bom.xlsx' ctx.expect_out_file_d(output) - ctx.search_err([r'WARNING:\(.*\) C1 field `Tolerance` collision, has `20%`, found `.10%`', - r'WARNING:\(.*\) R1 field `Tolerance` collision, has `1%`, found `.5%`', - 'C1 RoHS: Compliant', 'R2 Tolerance: .5%']) + ctx.search_err([r'WARNING:\(.*\) C1 field `Tolerance` collision, has `20%`, found `10%`', + r'WARNING:\(.*\) R1 field `Tolerance` collision, has `1%`, found `5%`', + 'C1 RoHS: ROHS3 Compliant']) ctx.clean_up() diff --git a/tests/yaml_samples/spec_to_field_1.kibot.yaml b/tests/yaml_samples/spec_to_field_1.kibot.yaml index 8a34cd7e..54736b1a 100644 --- a/tests/yaml_samples/spec_to_field_1.kibot.yaml +++ b/tests/yaml_samples/spec_to_field_1.kibot.yaml @@ -7,11 +7,11 @@ filters: comment: 'Copy the RoHS status' from_output: 'bom_internal' specs: - - spec: rohs_status + - spec: rohs field: RoHS - - spec: [resistance_tolerance, capacitance_tolerance] + - spec: [resistance_tolerance, capacitance_tolerance, _tolerance] field: Tolerance - compare: smart + type: percent outputs: - name: create_sch @@ -46,4 +46,4 @@ outputs: xlsx: kicost: true specs: true - kicost_config: tests/data/kicost_default_config.yaml + kicost_config: tests/data/kicost_dk_mou_cache.yaml