diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a856eb2d315534d87af12fd4aae72047c13dbc07..448c20f4239df398c1d8851b76676f909eadfa17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,6 +68,7 @@ coverage: - conda activate $CI_PROJECT_DIR/envs/blender_navipy - echo $CONDA_PREFIX - python navipy/scripts/blendunittest.py + coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/' artifacts: reports: @@ -88,7 +89,7 @@ coverage_noblend: - echo $CONDA_PREFIX - echo $PWD - ls - - pytest --cov-config=.coveragerc --cov --cov-report term --cov-report xml:coverage_noblend.xml + - pytest ./ --cov-config=.coveragerc --cov --cov-report term --cov-report xml:coverage_noblend.xml coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/' artifacts: diff --git a/navipy/resources/database.db b/navipy/resources/database.db index 174b416ffff2ccd72d24c722db4ddf1c6169e771..9342acccca0e3961a7664d590f105a1604e65803 100644 Binary files a/navipy/resources/database.db and b/navipy/resources/database.db differ diff --git a/navipy/resources/database2.db b/navipy/resources/database2.db index 9698915710f9ab0eb087f4daddd04cd343e6bc6b..6b98ac7f6a7fa8788c05ad47cc0aad5c78186a64 100644 Binary files a/navipy/resources/database2.db and b/navipy/resources/database2.db differ diff --git a/navipy/resources/rebuild_db.sh b/navipy/resources/rebuild_db.sh index 3c3f6cadaa89d71312f6029b066d6515bb5ce58e..2d36a929a6c0b02e1df3fe07c7168283fe893857 100644 --- a/navipy/resources/rebuild_db.sh +++ b/navipy/resources/rebuild_db.sh @@ -14,7 +14,7 @@ traj_file='./gridtwocylinders.csv' # move file just in case mv $db_filename $db_filename'.old' # run command -blendalongtraj --blender-world $blender_world --config-file $blender_config --output-file $db_filename -trajectory $traj_file --logfile $log_file -vvv +blendalongtraj --blender-world $blender_world --config-file $blender_config --output-file $db_filename --trajectory $traj_file --logfile $log_file -vvv #---- # Rebuild second database