Skip to content
Snippets Groups Projects
Commit 2b7ebfad authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

Merge branch 'f-pipeline' into 'dev'

FIX: if multiple updates for one entity exist, the retrieve would result in an...

See merge request !58
parents 326bd556 778ab044
No related branches found
No related tags found
2 merge requests!59FIX: if multiple updates for one entity exist, the retrieve would result in an...,!58FIX: if multiple updates for one entity exist, the retrieve would result in an...
Pipeline #29196 passed
...@@ -11,7 +11,7 @@ git clone 'https://gitlab.com/caosdb/caosdb-advanced-user-tools' ...@@ -11,7 +11,7 @@ git clone 'https://gitlab.com/caosdb/caosdb-advanced-user-tools'
Dependencies will be installed automatically if you use the below described Dependencies will be installed automatically if you use the below described
procedure. procedure.
- `caosdb>=0.6.0` - `caosdb>=0.6.0`
- `openpyxl>=3.0.0` - `openpyxl>=3.0.7`
- `xlrd>=1.2.0` - `xlrd>=1.2.0`
- `pandas>=1.2.0` - `pandas>=1.2.0`
- `numpy>=1.17.3` - `numpy>=1.17.3`
......
...@@ -157,7 +157,7 @@ def setup_package(): ...@@ -157,7 +157,7 @@ def setup_package():
install_requires=["caosdb>=0.7.0", install_requires=["caosdb>=0.7.0",
"jsonschema>=4.4.0", "jsonschema>=4.4.0",
"numpy>=1.17.3", "numpy>=1.17.3",
"openpyxl>=3.0.0", "openpyxl>=3.0.7",
"pandas>=1.2.0", "pandas>=1.2.0",
"xlrd>=2.0", "xlrd>=2.0",
], ],
......
...@@ -8,7 +8,7 @@ deps=nose ...@@ -8,7 +8,7 @@ deps=nose
pytest pytest
pytest-cov pytest-cov
gitignore-parser gitignore-parser
openpyxl openpyxl >= 3.0.7
xlrd == 1.2 xlrd == 1.2
h5py h5py
commands=py.test --cov=caosadvancedtools -vv {posargs} commands=py.test --cov=caosadvancedtools -vv {posargs}
......
...@@ -336,6 +336,7 @@ class MealTest(unittest.TestCase): ...@@ -336,6 +336,7 @@ class MealTest(unittest.TestCase):
class FileCacheTest(unittest.TestCase): class FileCacheTest(unittest.TestCase):
def test(self): def test(self):
# if there is no connection to a server an exception should be raised.
self.assertRaises(Exception, get_entity_for_path, "/lol") self.assertRaises(Exception, get_entity_for_path, "/lol")
FileCrawler(cfood_types=[], files=[db.File(path="/lol")]) FileCrawler(cfood_types=[], files=[db.File(path="/lol")])
get_entity_for_path("/lol") get_entity_for_path("/lol")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment