From b33c9f0b5482a85204b4f59afe5a44eee47a7863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org> Date: Wed, 2 Jun 2021 07:53:30 +0200 Subject: [PATCH] FIX: reverting part of f88a84d1 --- .../DataAnalysis/2010_TestProject/2019-02-03/README.md | 2 +- .../ExperimentalData/2010_TestProject/2019-02-03/README.md | 2 +- .../Posters/2019-02-03_really_cool_finding/README.md | 2 +- .../SimulationData/2010_TestProject/2019-02-03/README.md | 2 +- setup.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/README.md b/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/README.md index ce0111b8..71454e89 100644 --- a/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/README.md +++ b/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/README.md @@ -1,7 +1,7 @@ --- responsible: - Only Responsible -description: A description of this example analysis. +description: A description of another example analysis. sources: - file: "/ExperimentalData/2010_TestProject/2019-02-03/*.dat" diff --git a/integrationtests/extroot/ExperimentalData/2010_TestProject/2019-02-03/README.md b/integrationtests/extroot/ExperimentalData/2010_TestProject/2019-02-03/README.md index b9d7ef5e..b7e5051c 100644 --- a/integrationtests/extroot/ExperimentalData/2010_TestProject/2019-02-03/README.md +++ b/integrationtests/extroot/ExperimentalData/2010_TestProject/2019-02-03/README.md @@ -1,7 +1,7 @@ --- responsible: - Only Responsible -description: A description of this example experiment. +description: A description of another example experiment. results: - file: "/ExperimentalData/2010_TestProject/2019-02-03/*.dat" diff --git a/integrationtests/extroot/Publications/Posters/2019-02-03_really_cool_finding/README.md b/integrationtests/extroot/Publications/Posters/2019-02-03_really_cool_finding/README.md index 6d378818..c95e37ec 100644 --- a/integrationtests/extroot/Publications/Posters/2019-02-03_really_cool_finding/README.md +++ b/integrationtests/extroot/Publications/Posters/2019-02-03_really_cool_finding/README.md @@ -1,7 +1,7 @@ --- responsible: - Only Responsible -description: A description of this example experiment. +description: A description of another example experiment. sources: - /DataAnalysis/2010_TestProject/2019-02-03/results.pdf diff --git a/integrationtests/extroot/SimulationData/2010_TestProject/2019-02-03/README.md b/integrationtests/extroot/SimulationData/2010_TestProject/2019-02-03/README.md index f978bb77..fba1bd48 100644 --- a/integrationtests/extroot/SimulationData/2010_TestProject/2019-02-03/README.md +++ b/integrationtests/extroot/SimulationData/2010_TestProject/2019-02-03/README.md @@ -1,7 +1,7 @@ --- responsible: - Only Responsible -description: A description of this example experiment. +description: A description of another example experiment. results: - file: "*.dat" diff --git a/setup.py b/setup.py index 1d824f51..8902af8c 100755 --- a/setup.py +++ b/setup.py @@ -155,8 +155,8 @@ def setup_package(): author='Henrik tom Wörden', author_email='h.tomwoerden@indiscale.com', install_requires=["caosdb>=0.4.0", - "pandas>=1.2.0", - "xlrd>=2.0", + "openpyxl>=3.0.0", + "xlrd==1.2.0", ], packages=find_packages('src'), package_dir={'': 'src'}, -- GitLab