| Previous changeset 4:a0d3b0fe0fa3 (2024-04-11) Next changeset 6:30cdfd70f28d (2024-06-17) |
|
Commit message:
planemo upload for repository https://github.com/MaterialsGalaxy/larch-tools/tree/main/larch_athena commit 47b59eb1f13fe9f4893acbf9e3e77341d303de73 |
|
modified:
larch_athena.py larch_athena.xml |
|
added:
test-data/nested.zip |
| b |
| diff -r a0d3b0fe0fa3 -r 27015eaf9a78 larch_athena.py --- a/larch_athena.py Thu Apr 11 09:01:59 2024 +0000 +++ b/larch_athena.py Mon May 20 15:34:58 2024 +0000 |
| b |
| @@ -162,7 +162,7 @@ for filename in filenames: if len(all_paths) > 1: - key = f"{dirpath}_{filename}" + key = f"{dirpath.replace('/', '_')}_{filename}" else: key = filename filepath = os.path.join(dirpath, filename) |
| b |
| diff -r a0d3b0fe0fa3 -r 27015eaf9a78 larch_athena.xml --- a/larch_athena.xml Thu Apr 11 09:01:59 2024 +0000 +++ b/larch_athena.xml Mon May 20 15:34:58 2024 +0000 |
| [ |
| @@ -4,7 +4,7 @@ <!-- version of underlying tool (PEP 440) --> <token name="@TOOL_VERSION@">0.9.75</token> <!-- version of this tool wrapper (integer) --> - <token name="@WRAPPER_VERSION@">0</token> + <token name="@WRAPPER_VERSION@">1</token> <!-- citation should be updated with every underlying tool version --> <!-- typical fields to update are version, month, year, and doi --> <token name="@TOOL_CITATION@">10.1088/1742-6596/430/1/012007</token> @@ -449,6 +449,14 @@ </assert_contents> </output> </test> + <!-- 19: Zip file with nested directories --> + <test expect_num_outputs="2"> + <param name="is_zipped" value="true"/> + <param name="dat_file" value="nested.zip"/> + <param name="plot_graph" value="edge,flat,dmude"/> + <output_collection name="athena_project_file_collection" type="list" count="2"/> + <output_collection name="plot_collection" type="list" count="2"/> + </test> </tests> <help><![CDATA[ Using Larch, create an Athena project file from the input X-ray Absorption Fine Structure (XAFS) data file. |
| b |
| diff -r a0d3b0fe0fa3 -r 27015eaf9a78 test-data/nested.zip |
| b |
| Binary file test-data/nested.zip has changed |