From a2dd2105fd5a7dae318d03ef0d211426a058b271 Mon Sep 17 00:00:00 2001
From: fspreck <f.spreckelsen@indiscale.com>
Date: Mon, 12 Sep 2022 15:15:42 +0200
Subject: [PATCH] FIX: Unittest and use dev branch of pylib and advancedtools
in tox
---
.gitignore | 1 +
tox.ini | 5 ++++-
unittests/scifolder_cfood.yml | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 11c17317..9af5ee22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ provenance.yml
*.jks
*.tar.gz
*.sql
+/integrationtests/test-profile/custom/other/cert/
diff --git a/tox.ini b/tox.ini
index 2cf966fb..5ab67e67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,14 @@
[tox]
-envlist=py36, py37, py38, py39, py310
+envlist=py38, py39, py310
skip_missing_interpreters = true
[testenv]
deps = .
pytest
pytest-cov
+ # TODO: Make this f-branch sensitive
+ git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
+ git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@dev
commands=py.test --cov=caosdb -vv {posargs}
[flake8]
max-line-length=100
diff --git a/unittests/scifolder_cfood.yml b/unittests/scifolder_cfood.yml
index 5eb33c5a..90f19344 100644
--- a/unittests/scifolder_cfood.yml
+++ b/unittests/scifolder_cfood.yml
@@ -16,12 +16,12 @@ Data: # name of the converter
subtree: &template
project_dir: # name of the first subtree element which is a converter
type: Directory
- match: ((?P<year>[0-9]{4,4})_)?(?P<identifier>.*)
+ match: ((?P<date>[0-9]{4,4})_)?(?P<identifier>.*)
records:
Project: # this is an identifiable in this case
parents:
- Project # not needed as the name is equivalent
- date: $year
+ date: $date
identifier: $identifier
subtree:
--
GitLab