Skip to content
Snippets Groups Projects
Commit 4298c611 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge remote-tracking branch 'origin/f-output' into f-output

parents 64cf08ed f88a84d1
No related branches found
No related tags found
1 merge request!4MAINT: be more specific with output
Pipeline #7968 failed
--- ---
responsible: responsible:
- Only Responsible - Only Responsible
description: A description of another example analysis. description: A description of this example analysis.
sources: sources:
- file: "/ExperimentalData/2010_TestProject/2019-02-03/*.dat" - file: "/ExperimentalData/2010_TestProject/2019-02-03/*.dat"
......
--- ---
responsible: responsible:
- Only Responsible - Only Responsible
description: A description of another example experiment. description: A description of this example experiment.
results: results:
- file: "/ExperimentalData/2010_TestProject/2019-02-03/*.dat" - file: "/ExperimentalData/2010_TestProject/2019-02-03/*.dat"
......
--- ---
responsible: responsible:
- Only Responsible - Only Responsible
description: A description of another example experiment. description: A description of this example experiment.
sources: sources:
- /DataAnalysis/2010_TestProject/2019-02-03/results.pdf - /DataAnalysis/2010_TestProject/2019-02-03/results.pdf
......
--- ---
responsible: responsible:
- Only Responsible - Only Responsible
description: A description of another example experiment. description: A description of this example experiment.
results: results:
- file: "*.dat" - file: "*.dat"
......
...@@ -155,8 +155,8 @@ def setup_package(): ...@@ -155,8 +155,8 @@ def setup_package():
author='Henrik tom Wörden', author='Henrik tom Wörden',
author_email='h.tomwoerden@indiscale.com', author_email='h.tomwoerden@indiscale.com',
install_requires=["caosdb>=0.4.0", install_requires=["caosdb>=0.4.0",
"openpyxl>=3.0.0", "pandas>=1.2.0",
"xlrd==1.2.0", "xlrd>=2.0",
], ],
packages=find_packages('src'), packages=find_packages('src'),
package_dir={'': 'src'}, package_dir={'': 'src'},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment