when testing development version of Dimple don't use ccp4-python

because then the dimple modules from CCP4 installation are imported
ccp4 · Apr 20, 2018 · d558937 · d558937
1 parent 26f9adb
commit d558937
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/dimple b/dimple
@@ -3,11 +3,7 @@
 this_dir="$(cd "$(dirname "$0")" && pwd)"
 if [ -e "$this_dir/main.py" ] && [ "$this_dir" != "$CCP4/bin" ]; then
   # development (source tree) version
-  if [ -e "$CCP4/bin/ccp4-python" ]; then
-    exec "$CCP4/bin/ccp4-python" "$this_dir/main.py" "$@"
-  else
-    exec python2.7 "$this_dir/main.py" "$@"
-  fi
+  exec python2.7 "$this_dir/main.py" "$@"
 else
   # installed module
   exec "$CCP4/bin/ccp4-python" -m dimple "$@"

diff --git a/tests/test.bat b/tests/test.bat
@@ -2,6 +2,6 @@
 @set testdir=%~dp0
 
 @echo      === Run dimple on artificial thaumatin example ===
-@set PYTHONPATH=%testdir%..
-@call ccp4-python "%testdir%..\main.py" "%testdir%thaumatin.mtz" "%testdir%thaumatin.pdb" "%testdir%out" %*
+@set PYTHONPATH=%testdir%..\..
+@call %CCP4%\..\Python2.7\python "%testdir%..\main.py" "%testdir%thaumatin.mtz" "%testdir%thaumatin.pdb" "%testdir%out" %*
 @pause