diff --git a/.gitignore b/.gitignore index 11c17317428964b82b47d55399a4dde1a9e698a9..9af5ee22fdd68c1c25e98614ab516bf4d384d577 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 2cf966fb5b80e62cb7f216b0785ba567e13ee3ff..5ab67e67cfef0b3cf0cf82d2d28de0fe11aca6a1 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 5eb33c5a653e5c47a4dba7139256f23df6caae55..90f193444bfda7296c46260236274da2378635cc 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: