Make it easier to run a trapdoor script locally.

theochem / horton

HORTON: Helpful Open-source Research TOol for N-fermion systems

http://theochem.github.io/horton/

GNU General Public License v3.0

94 stars 40 forks source link

Make it easier to run a trapdoor script locally. #93

Closed tovrstra closed 8 years ago

tovrstra commented 8 years ago

This should be a lighter version of tools/qa/simulate_ci.sh, only doing the following:

git stash uncommitted changes
checkout master and pull the latest master from origin
make a temporary merge with master, including stashed changes (stop and restore everything, if this does not work automatically)
checkout merge, run trapdoor feature
checkout ancestor, run trapdoor ancestor
run trapdoor report
remove the merge
checkout feature
unstash uncomitted changes.

tovrstra commented 8 years ago

P.S. The usage of the script should also be documented in tech_dev_checklist.rst

tovrstra commented 8 years ago

Things that still need to be done:

Add -u, --unsafe option to do more repo manipulations automatically: pull latest master from origin, remove branch with temporary merge from previous run, commit uncommitted changes in feature branch.
(Done) -r, --rebuild option to recompile horton extensions in both branches. (This is only needed from some trapdoor scripts when the c++ or cython code has changed. Rebuilding all the time is not convenient.

tovrstra commented 8 years ago

It would be better to document how to use the script properly and how to clean up after the script crashed badly. Then we don't need the --unsafe option. It would still be useful to have a --clear option to get rid of the temporary branch automatically.