diff --git a/VERSION b/VERSION index be9f38593d9ad35ece333d7ff7999957c83a1867_VkVSU0lPTg==..5cf5b53183c9f6553607d640f96a7973a29d6b26_VkVSU0lPTg== 100644 --- a/VERSION +++ b/VERSION @@ -1,1 +1,1 @@ -2.4 +2.5 diff --git a/do_tests b/do_tests index be9f38593d9ad35ece333d7ff7999957c83a1867_ZG9fdGVzdHM=..5cf5b53183c9f6553607d640f96a7973a29d6b26_ZG9fdGVzdHM= 100755 --- a/do_tests +++ b/do_tests @@ -13,7 +13,7 @@ # # - access to pg database # -# Version 2.4 +# Version 2.5 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) dbname=$(basename $project_home)_test diff --git a/docker_build b/docker_build index be9f38593d9ad35ece333d7ff7999957c83a1867_ZG9ja2VyX2J1aWxk..5cf5b53183c9f6553607d640f96a7973a29d6b26_ZG9ja2VyX2J1aWxk 100755 --- a/docker_build +++ b/docker_build @@ -1,5 +1,5 @@ #!/bin/zsh -# template version 2.4 +# template version 2.5 # TODO add a way to bypass the value, maybe with a key in the setup.cfg file repository=dockerhub.xcg.io diff --git a/run_tests b/run_tests index be9f38593d9ad35ece333d7ff7999957c83a1867_cnVuX3Rlc3Rz..5cf5b53183c9f6553607d640f96a7973a29d6b26_cnVuX3Rlc3Rz 100755 --- a/run_tests +++ b/run_tests @@ -4,7 +4,7 @@ # This script is used to run tests on a database with demo data installed. # # Either provide the name of the database (first argument) or it will default to <project>_test -# Version 2.4 +# Version 2.5 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) tested_modules=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print ','.join(c.get('odoo_scripts', 'module_list_tests', '').split())") @@ -8,6 +8,10 @@ here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) tested_modules=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print ','.join(c.get('odoo_scripts', 'module_list_tests', '').split())") +if [[ "$tested_modules" != "" ]]; +then + update="-u $tested_modules" +fi dbname=$1 if [[ -z "$dbname" ]]; then @@ -24,4 +28,4 @@ else loglevel="--log-level=test" fi -$here/start -u $tested_modules -d $dbname --test-enable $loglevel --max-cron=0 --stop-after-init $* +$here/start $update -d $dbname --test-enable $loglevel --max-cron=0 --stop-after-init $* diff --git a/setup.cfg b/setup.cfg index be9f38593d9ad35ece333d7ff7999957c83a1867_c2V0dXAuY2Zn..5cf5b53183c9f6553607d640f96a7973a29d6b26_c2V0dXAuY2Zn 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.4 +current_version = 2.5 parse = (?P<major>\d+)\.(?P<minor>\d+) serialize = {major}.{minor} diff --git a/start b/start index be9f38593d9ad35ece333d7ff7999957c83a1867_c3RhcnQ=..5cf5b53183c9f6553607d640f96a7973a29d6b26_c3RhcnQ= 100755 --- a/start +++ b/start @@ -5,7 +5,7 @@ # # You can set ODOO_DATA_DIR and ODOO_DB_HOST if you want to avoid using the default value ($HOME/var/tmp and localhost) # -# Version 2.4 +# Version 2.5 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) echo "Starting odoo for development"