From 35df392f79580bf8d28c3ed2fa093511db9a2f7e Mon Sep 17 00:00:00 2001 From: Eric Lapouyade Date: Tue, 31 Jan 2017 09:26:14 +0100 Subject: [PATCH] Remove version limitation over sphinx package in setup.py --- CHANGES.rst | 4 ++++ docxtpl/__init__.py | 2 +- setup.py | 2 +- tests/test_files/cellbg.docx | Bin 8189 -> 8189 bytes tests/test_files/dynamic_table.docx | Bin 5284 -> 5284 bytes tests/test_files/escape.docx | Bin 8102 -> 8102 bytes tests/test_files/header_footer.docx | Bin 12815 -> 12815 bytes tests/test_files/header_footer_utf8.docx | Bin 14047 -> 14047 bytes tests/test_files/inline_image.docx | Bin 264568 -> 264568 bytes tests/test_files/nested_for.docx | Bin 11623 -> 11623 bytes tests/test_files/order.docx | Bin 9339 -> 9339 bytes tests/test_files/richtext.docx | Bin 8890 -> 8890 bytes tests/test_files/subdoc.docx | Bin 56194 -> 56194 bytes 13 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 365c5ad..006c230 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,7 @@ +0.3.2 (2017-01-16) +------------------ +- Remove version limitation over sphinx package in setup.py + 0.3.1 (2017-01-16) ------------------ - Add PNG & JPEG in tests/test_files/ diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py index 589b4aa..40b5fba 100644 --- a/docxtpl/__init__.py +++ b/docxtpl/__init__.py @@ -5,7 +5,7 @@ Created : 2015-03-12 @author: Eric Lapouyade ''' -__version__ = '0.3.1' +__version__ = '0.3.2' from lxml import etree from docx import Document diff --git a/setup.py b/setup.py index 502c3de..29b5383 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,6 @@ setup(name='docxtpl', license='LGPL 2.1', packages=['docxtpl'], install_requires=['six', 'python-docx', 'jinja2', 'lxml'], - extras_require={'docs': ['Sphinx<1.3b', 'sphinxcontrib-napoleon']}, + extras_require={'docs': ['Sphinx', 'sphinxcontrib-napoleon']}, eager_resources=['docs'], zip_safe=False) diff --git a/tests/test_files/cellbg.docx b/tests/test_files/cellbg.docx index 1648c761bc501588660d07e4a7d59702b7d1d76d..7dca45e6f61fc066f7d7bcbda375ee3d01a002a4 100644 GIT binary patch delta 199 zcmexs|JR;3z?+#xgn@y9gW<5R!A9O@MrI(rc`_qEgt3%qA%x+{QUqb_V+~;es}bc= zg^1X4e`5uUm{!E}{8MBPq#7XTO)LU8~9 delta 199 zcmexs|JR;3z?+#xgn@y9gJDOk{zl$rMrI(rc`_qEgt3%qA%x+{QUqb_V+~;es}bc= zg^1X4e`5uUm{!E}{8MBPq#7XUX2LdgIC diff --git a/tests/test_files/dynamic_table.docx b/tests/test_files/dynamic_table.docx index eff6dc766d5b06c560566dfdba7fea49ee639645..d9aaa3e8384a0997fe0ce21562464e7512915075 100644 GIT binary patch delta 165 zcmZ3YxkQsUz?+#xgn@y9gW<5R!A9OpMrI(rxss6=!sujTVh4-#adLx2CePve1{Rpg z?FCWti02yEAlm zVA@jG2258#>Fv7iU_PUsEtq!Hvj@}7dJuKL^ra`?)l&e8P11)LVF#sa^ubyt0aaYr p2dkL;3o2z{08v_I05N5&ffd-)PX-WI85??n`Spg*VEU+`7XZ0`iG%zmfMGBQucRe2EAlm zVA@jG2258#>Fv7iU_PUsEtq!Hvj@}7dJuKL^ra`?)l&e8P11)LVF#sa^ubyt0aaYr p2dkL;3o2z{08v_I05N5&ffd-)PX-WI85??n`Spg*VEU+`7XUd%iZlQK diff --git a/tests/test_files/header_footer_utf8.docx b/tests/test_files/header_footer_utf8.docx index 4465a0b753afd1bea79cbf97bc11dbc2b82d4774..24b90ab468fac50ade55abb1a3fb9b2fd13f6ee4 100644 GIT binary patch delta 317 zcmcbgdq0;qz?+#xgn@y9gW<5R!A9OajLblK^BG2d2;&~p90;S9r4GXQ$9kF>qJ}dA zB4W<{jTJ0nAZW-0W~2yLLKqK3^C65N33CXeN6HGqI4NTV(at8Pzyj8#sT9QvVoYw+ z-vXv>4ZeXT%nSvqJ}dA zB4W<{jTJ0nAZW-0W~2yLLKqK3^C65N33CXeN6HGqI4NTV(at8Pzyj8#sT9QvVoYw+ z-vXv>4ZeXT%nSv!@dR^c^5D;1L@5h7-b-g^Gux(Ml=gl>L2S8h{#g* zFC1XSa|9B>BAbLZDDVMwd%fFw-py5rfx$s&GGmh1<|{@aLSTj3t|w%`jBkk_xxtKA zxm$VoL0V$s_2sYbWn%cepK0=bBhlu=RqcnX7`Gp;VtTR{q;mTz3+AU=!K_K|n7^@t zS>0clm6<@S=^MW>p9KpwerGmi2D5hlV!p=-mYl`HVh3j2W??Y{GelUSBB87-)?ksz ztSmNQ#w8d-kd4J1EE3Je;s9pMgE1b$7%J>gsdN})6^!u~#xUT3sww7Ru?3s6nS;e1 O%=pRywbX=@#RUM@$%?iB delta 400 zcmew{N#MsM0p0*_W)=|!1_lm>?XmhBc^5D;1L@5h7-b-g^Gux(Ml=gl>L2S8h{#g* zFC1XSa|9B>BAbLZDDVMwd%fFw-py5rfx$s&GGmh1<|{@aLSTj3t|w%`jBkk_xxtKA zxm$VoL0V$s_2sYbWn%cepK0=bBhlu=RqcnX7`Gp;VtTR{q;mTz3+AU=nRftLlio3Z zV+FIizc4E^fmqWweq%lh7Ha&?Y|0E~?fk`jj}xSI`YaX}J22xm3yT?;A;Jn331wxm z28&E)Ww8M>F2NXrY%K0zk!Us+2QXtEjPVf0P+^BkrNbDjV2rmQ2FPg!98g9v2a7FO VWHSegJ(%&8186BojR_}<3ji(ni!uNJ diff --git a/tests/test_files/nested_for.docx b/tests/test_files/nested_for.docx index 883b7e686d0b2d4ec1965b81dbc311bae637a74e..939fa57905d3e421e3ca9de664bb87fb15da479e 100644 GIT binary patch delta 316 zcmaDJ^*o9?sLh!R`Ads{$(?`|5fhG2-3xM@ZzNldbmJrf31JmA`)?m6*(*{hRfYR(*?qGhPmOYrBtYr(P uFKa>63u;4Xe{G1qK5dBnIc*29Izb(Xcz})-nBS`dvG<&gCzvm#>k9w{z-t!( delta 316 zcmaDJ^*o9?sLh!R`Ads{$(?`|5fhG2-3xM@ZzNldbmJrf31JmA`)?m6*(*{hRfYR(*?qGhPmOYrBtYr(P uFKa>63u;4Xe{G1qK5dBnIc*29Izb(Xcz})-nBS`dvG<&gCzvm#>k9x_fNQ4! diff --git a/tests/test_files/order.docx b/tests/test_files/order.docx index 8b1ec7a4dd565719ba436f406668f971c852e67a..1e8a0806127f3273a12caec88fcfe6561f69a062 100644 GIT binary patch delta 199 zcmezE@!Nwpz?+#xgn@y9gW<5R!A9O@MrI(rc`_qEgt3%~l?g1emZbn9qQEwd1uU|Y zOBEvWkoy}eSmc)AY_Q1W3gO3KfjE&L5Z#gD;anh*$(t4J!1NbIGcc{IWDTaXm2AND hDk%L@$sNo$R(1f>Wy-c-dYiI6nEs&*QE#r|0swWBLp%Tg delta 199 zcmezE@!Nwpz?+#xgn@y9gJFBD{zl$rMrI(rc`_qEgt3%~l?g1emZbn9qQEwd1uU|Y zOBEvWkoy}eSmc)AY_Q1W3gO3KfjE&L5Z#gD;anh*$(t4J!1NbIGcc{IWDTaXm2AND hDk%L@$sNo$R(1f>Wy-c-dYiI6nEs&*QE#r|0sxGCLw*1N diff --git a/tests/test_files/richtext.docx b/tests/test_files/richtext.docx index 0a3cc02047b5c20ace5a68ab9552c8a5c441eaa5..4093c4140b4aafa2321c1092ca9ddbc04cd6a828 100644 GIT binary patch delta 199 zcmdnxy33U}z?+#xgn@y9gW<5R!A9O@MrI(rc`_qEgt3%~jR`EWjwK%=qQLf&1uVkD ztqKt_;rYf27SR>j3l^FDR`@Yk;IfDYGnnyD{3APvG5M3c9hf#&Fay&$3f5qHm4XeJ hehH;D6y3r6B1H!j3l^FDR`@Yk;IfDYGnnyD{3APvG5M3c9hf#&Fay&$3f5qHm4XeJ hehH;D6y3r6B1H!J-X2C~Aia4GBR_<(j%hK35yDamVVq$NX9ufM z<28qfB=9}m3KsD=@{JYDa6GjaEH#<&%ww>?^E3L)V20#{Xbuo#a`_EAFumi38JPZf u!x~KM-?RbKc~E-oO?NQ=`%MQhZFLJm*WR)P^Y`Ae2h;y=LG;<(b^!nZmQ?^E3L)V20#{Xbuo#a`_EAFumi38JPZf u!x~KM-?RbKc~E-oO?NQ=`%MQhZFLJm*WR)P^Y`Ae2h;y=LG;<(b^!n!=TzPR