From 8f472222d7eaa8c4348189d55970477b4ea5616a Mon Sep 17 00:00:00 2001 From: Eric Lapouyade Date: Fri, 17 Jul 2015 09:56:34 +0200 Subject: [PATCH] version 0.1.6 --- CHANGES.rst | 5 +++++ docxtpl/__init__.py | 4 ++-- setup.py | 4 ++-- tests/test_files/cellbg.docx | Bin 8311 -> 8311 bytes tests/test_files/order.docx | Bin 9472 -> 9472 bytes tests/test_files/richtext.docx | Bin 8927 -> 8923 bytes 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 71bff4a..933bd44 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +0.1.6 (2015-05-11) +------------------ +- remove debug code +- add lxml dependency + 0.1.5 (2015-05-11) ------------------ - fix template filter with quote diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py index 2147901..5b86a17 100644 --- a/docxtpl/__init__.py +++ b/docxtpl/__init__.py @@ -5,7 +5,7 @@ Created : 2015-03-12 @author: Eric Lapouyade ''' -__version__ = '0.1.5' +__version__ = '0.1.6' from lxml import etree from docx import Document @@ -53,7 +53,7 @@ class DocxTemplate(object): # This is mandatory to have jinja2 generating correct xml code pat = r'](?:(?!]).)*({%%|{{)%(y)s ([^}%%]*(?:%%}|}})).*?' % {'y':y} src_xml = re.sub(pat, r'\1 \2',src_xml,flags=re.DOTALL) - + src_xml = src_xml.replace(r"‘","'") return src_xml diff --git a/setup.py b/setup.py index 4a81c34..20816c8 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ News """ % read('README', 'CHANGES') setup(name='docxtpl', - version='0.1.5', + version='0.1.6', description='Python docx template engine', long_description=long_description, classifiers=[ @@ -39,6 +39,6 @@ setup(name='docxtpl', author_email='elapouya@gmail.com', license='LGPL 2.1', packages=['docxtpl'], - install_requires = ['Sphinx<1.3b', 'sphinxcontrib-napoleon', 'python-docx','jinja2'], + install_requires = ['Sphinx<1.3b', 'sphinxcontrib-napoleon', 'python-docx','jinja2', 'lxml'], eager_resources = ['docs'], zip_safe=False) diff --git a/tests/test_files/cellbg.docx b/tests/test_files/cellbg.docx index 2512c6bcdcc5683ade9315d46a94673622a9caa5..6062c808b99509fb3a611959347062c719bab056 100644 GIT binary patch delta 199 zcmezF@ZEtoz?+#xgn@y9gF(XQ<3`?QMrI(rc`_qEgt3%qA%x+{QUqb_V?DBOx*&sL@EHc?o_%T?(MC3OUm|-Md#Rg(bUN370ra#Dn+a diff --git a/tests/test_files/order.docx b/tests/test_files/order.docx index 30b4e10ea91e53f7ef1a44de3100aacd6d5e532f..f054a5516fc5fd6ac13f30e33eff8dcafcb0e367 100644 GIT binary patch delta 199 zcmZqhYVhI>@MdNaVPIh3V7Tb_aU*XtBQucRJeiRn!dS}0$^;f!%TfRlQDBp11&i2m zt3pK5c)meI;)P~|MJE3hehgOfSmXyp_dW4&E|AD%3ne=+U8!USrZ*{BgXs@SHegy` h8A9hNyMy^VlpVnIZ)ICBZLMMtrfXFo>h`F(005zfQ;q-t delta 199 zcmZqhYVhI>@MdNaVPIh3V7S?myOFn7f58Xg_0eZu2eDu)0>p6!Sn|u8!)Y} g459Os-NF1F$_`-qx3VpmwpOtR)3quPb$e7?0D!qoiU0rr diff --git a/tests/test_files/richtext.docx b/tests/test_files/richtext.docx index d100cf660fa48cb217d74b765299fb65abeb9698..f1b914987cfbbd39949c254832eb588dfd56fe66 100644 GIT binary patch delta 1574 zcmZ9MYdjNr7{@n^Y;%oS?Tl?G$^D+(!*OZKatR}sFg2XqlVge`avdF7t%Rr~jxj@G zC)bZSp}Ct&xpdryFeOLpoEPW(-~4{h@A*H^=Xv#ITa8+YoVDi{kOBYz2LNNIIaMNw zK>mHLCIiKOm=ZogK3-BG5DFC8Z&{l&M9U`x0Dv20Wx>NF`%r|wc+;F~rJ?09Z~Nn; zc}PXvKD@Qjy3 z?DfrRfm}aQhxzaXd?$T~K^qM5FilPxz3X5;Rcp38ZjPv(fYG8tl{=*daYrEWnaIKQe0X5C2)1dSk4F94ZIBzk(FY89FaD_8q4_- z_D5@7fR@w-&FK!HvP zwYFUx1!+{sNJ8rMX$|=>uN;dL?Acr6W`^2UQl8>aN)he>D^}0r{WqW3EDh&=fj@l; zgakm-TY3q53e_3@uop;vkAO;?X;CC8CID&|aW(Zc5sdRP48f~z`OM59cfNu>o6wK7 zrH#PUkDGo?A6UK{zQw*Oh`Y0DEU>(G0&A~@J`&?vW!CSO`bvXL#2rnV?g&3p<7asB zyaMvcjkPfkJ7IaHGbRG3DQg@3Ev3-uRND2ycDsoC5g6eD?mXx^+C2UG@a-{{Uywy{AUQb3k zcvYF;i(GIydRDgwVcVX@v755Wt9UD!OqEH#>{isQ4RdD(u<9UUpT*_8g9ScrPWqs~ zx{nrxo7FxlIM`r7KT@A$&yc7Ma*dFoRYV_jKM{SDmYt%by!`wUFTdNJ5p5iw~`O7 zc~fHpGoH%dcnY)L+Cjh@jpmi0Ar$3Enm9m{+Z=pcT5Y_~(!?EF7RcS?Pk5Y*v1|AUF z-bhM9vA4I_&2@>5csk~&U!FD7cd$aXexWGd3jP)JA4XbZbj!n*_lc>&4**n~K;S<> z=?2{d@j!`_e8o%1l2S9gU|ULwpJ(LZ9HH-qEQ2!P>3NhMPqR@cdD@FI`X6H9Xf0j` zi$?IFAY?O$EI9=YmHW=&iqIUsHV^>dhyVbj_s{wFB>-*6)o2CY*vS5vxg^;~Qi=@0 rKzY$&41y0RMMg`($k=}(JO%-rBgbG+ybqN9N|H>+U<3tF-*^5E32x-p delta 1697 zcmZ8hdpy%?9R6){*K*k~EjF{trB)Ord(sEiKu87hDk0bqKlTx zrqQIVh(&ZGql-(Wj1#$>bJRMsKF;S;-+!LxeZJ58KJQ=8pz|ANsJ9110S*9w3IIBg zTn9}DL1f5ffi!-QO0W`GuG~~0gP^jNOHGj{Y(xP7GFfIytEk=4NE^+T52pJK%Hg$@ z`I92LwrR`;LATLOO*@lhv#YNLh?v0RJA88aI{*ill!+nZoqLt6AUNC5R& z%6#%uRi1v@`}9RdMO=Tso2Ue# zW*XQx^rbn06Ivl?$k|hp+ZK(XRB%=ra)4vrYCJ;C)BCb;<2K8x4o|qfHW))m-iJ< zML&+ZLT$~1O`lLG{U^MC(L$-sa$7Kr{?OH={X$KCy7|NQAr*Yyz2a~S6lAlIaiC>Z zXlv|BkFl6yizRPWyRnkmO9ibfVRVn-%`wvMIn+T`kd5z}oy-Yd*XwNmZ$ing9C4lL zf`yMSM7IkOd8e#b+Sy@iT^})tcxjog^RGUKdfzw1yZn()Xs|DHMtE%0tcig{{q^Jn zdwd3}RdW5U+voLs)R#4U-3mQposfZAtJpe!#08L*RHNlZyWqTH(PJM;hH>ZGy}x%b z><{_aRXJulKP8!&Jib$zx9RlAnBzU3>23!DiU^JKLKZgjO_;-Kxqd?bhtn$!r9%Bq zs)}z^2M3ZKyV`L8uvRlk+ibVW{|}9-L9OtpomfKWdj1IoHP5=OUVY@Ajntry;ENQJ z;_zVPq1rs8p?+yQ^j4dyI9xPcJxM<@|M8i1WmcKE|6zSq?C zppS}c=G;$t46oq5w@T{LPUK4q8%57|QNyloaz31qmHYS89`F#hA|d~4F?+3(&yM{@ zNBTx^I&tjm8S5k+t2%mIHOvJ0fp&ScEvfQzv-`eqRmUFn`wcg8M)lPJL!$#`N;qTg_1dP%dO z%UoB`B#lo=uDYB5jM``U4Y`)u(j>2UeQ!j78#{Q^)w0+B)7I;zIBG zh}n$N%X*TO>y)ItHsoaoSu6}$Jy%G@`3yFq=|PF*lMCTv^2=LH<{}8UCq8q8}0S9y(r$@z_B{Wy!>T%rXwwD9k=duO!O8dLtw;qmL7qK?DFQ4PPo}Mqi5wUom+q2A}qt%pME9A#~mUx#(Sp%^!XnRqxyde(FgV%$6I+ zr(~_kwN_vKqbT>Tm{*h+>$UZ7oL{+D?v- z(DuJnEZoRazHu``g0bo>dv!x|Zx0X{4*9>bU2c+d!R?9wum=eMI