Mercurial > repos > artbio > facturation_ibps
changeset 1:e93bf8bd0e93 draft default tip
"planemo upload for repository https://github.com/ARTbio/tools-artbio/tree/master/tools/facturation_ibps commit 6b477d835f8e555ead1571295c3db0a355af721d"
| author | artbio |
|---|---|
| date | Sat, 20 Jun 2020 20:14:26 -0400 |
| parents | 27f2ef353554 |
| children | |
| files | facturation.py facturation.xml requirements.txt test-data/testdouble.xlsx test-data/testfacture.xlsx test-data/testfacture_electronique.xlsx test-data/testfacture_electronique_reduc.xlsx |
| diffstat | 7 files changed, 20 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/facturation.py Mon May 11 19:42:27 2020 -0400 +++ b/facturation.py Sat Jun 20 20:14:26 2020 -0400 @@ -72,7 +72,7 @@ # ouverture fichier output facture_output = openpyxl.load_workbook( - template, data_only='True', keep_vba=False) + template, data_only=False, keep_vba=False) ws = facture_output.worksheets[0] # rajout de l'image de SU qui ne survit pas à la conversion
--- a/facturation.xml Mon May 11 19:42:27 2020 -0400 +++ b/facturation.xml Sat Jun 20 20:14:26 2020 -0400 @@ -1,4 +1,4 @@ -<tool id="facturation_ibps" name="IBPS facturation parser" version="0.6.0"> +<tool id="facturation_ibps" name="IBPS facturation parser" version="0.7.0"> <description /> <requirements> <requirement type="package" version="4.9.0">beautifulsoup4</requirement> @@ -32,23 +32,23 @@ <test> <param ftype="txt" name="input" value="doublefacture.htm" /> <param name="template" value="template_facture_M_photonique.xlsx" /> - <output file="testdouble.xlsx" name="output" decompress="true" /> + <output file="testdouble.xlsx" name="output" compare="sim_size" delta="1" /> </test> <test> <param ftype="txt" name="input" value="facture.htm" /> <param name="template" value="template_facture_M_photonique.xlsx" /> - <output file="testfacture.xlsx" name="output" decompress="true" /> + <output file="testfacture.xlsx" name="output" compare="sim_size" delta="1" /> </test> <test> <param ftype="txt" name="input" value="Microscopie_Electronique-2018-67.html" /> <param name="template" value="template_facture_M_electronique.xlsx" /> - <output file="testfacture_electronique.xlsx" name="output" decompress="true" /> + <output file="testfacture_electronique.xlsx" name="output" compare="sim_size" delta="1" /> </test> <test> <param ftype="txt" name="input" value="Microscopie_Electronique-2018-67.html" /> <param name="template" value="template_facture_M_electronique.xlsx" /> <param name="reduction" value="0.34" /> - <output file="testfacture_electronique_reduc.xlsx" name="output" decompress="true" /> + <output file="testfacture_electronique_reduc.xlsx" name="output" compare="sim_size" delta="100" /> </test> </tests> <help>
--- a/requirements.txt Mon May 11 19:42:27 2020 -0400 +++ b/requirements.txt Sat Jun 20 20:14:26 2020 -0400 @@ -1,5 +1,15 @@ -openpyxl==2.5.9 -pandas==0.23.4 -bs4==0.0.1 -m3-PIL==1.1.7 +diff --git a/lib/galaxy/util/checkers.py b/lib/galaxy/util/checkers.py +index 3098d92..0058cff 100644 +--- a/lib/galaxy/util/checkers.py ++++ b/lib/galaxy/util/checkers.py +@@ -41,7 +41,7 @@ def check_html(file_path, chunk=None): + for line in temp: + line = util.unicodify(line) + lineno += 1 +- matches = regexp1.search(line) or regexp2.search(line) or regexp3.search(line) or regexp4.search(line) or regexp5.searc +h(line) ++ matches = False + if matches: + if chunk is None: + temp.close()