cleanup

FABLE-3DXRD · Jul 25, 2024 · 5101312 · 5101312
1 parent bdc5d73
commit 5101312
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 22 deletions.
diff --git a/ImageD11/project/h5demo1.py → ImageD11/depreciated/project/h5demo1.py b/ImageD11/project/h5demo1.py → ImageD11/depreciated/project/h5demo1.py
diff --git a/...ject/make_h5_project_fails_no_external.py → ...ject/make_h5_project_fails_no_external.py b/...ject/make_h5_project_fails_no_external.py → ...ject/make_h5_project_fails_no_external.py
diff --git a/ImageD11/project/plan_new_peaksearch.md → ...epreciated/project/plan_new_peaksearch.md b/ImageD11/project/plan_new_peaksearch.md → ...epreciated/project/plan_new_peaksearch.md
diff --git a/ImageD11/project/project.py → ImageD11/depreciated/project/project.py b/ImageD11/project/project.py → ImageD11/depreciated/project/project.py
diff --git a/ImageD11/project/project_yaml.py → ImageD11/depreciated/project/project_yaml.py b/ImageD11/project/project_yaml.py → ImageD11/depreciated/project/project_yaml.py
diff --git a/ImageD11/project/projects.py → ImageD11/depreciated/project/projects.py b/ImageD11/project/projects.py → ImageD11/depreciated/project/projects.py
diff --git a/ImageD11/project/test_json.py → ImageD11/depreciated/project/test_json.py b/ImageD11/project/test_json.py → ImageD11/depreciated/project/test_json.py
diff --git a/bld_test_linux.sh b/bld_test_linux.sh
@@ -1,30 +1,26 @@
 #!/usr/bin/env bash
 
-python setup.py build bdist_wheel
 
 # pip install dist/ImageD11-1.7.0-cp27-none-linux_x86_64.whl --user
 # PYTHONPATH=$HOME/.local/lib/python2.7/site-packages
 PYT=python
 SRC=`pwd`
-PYTHONPATH=$SRC/build/lib.linux-x86-64-2.7:$PYTHONPATH
-
-echo "Running tests from " $SRC " with PYTHONPATH " $PYTHONPATH
+$PYT setup.py build_ext --inplace > bld.log 2> bld.err
+PYTHONPATH=`pwd`
+export PYTHONPATH=$PYTHONPATH
+echo "Running tests from " $SRC " with PYTHONPATH: " $PYTHONPATH
 
+cd $SRC/test && $PYT -c 'import ImageD11, sys; sys.stdout.write(ImageD11.__file__+"\n")'
 
 
+cd $SRC/test
+$PYT run_tests.py
+cd $SRC
 
 cd $SRC/test/demo
-echo `pwd` latred_new.py
-$PYT latred_new.py
 echo `pwd` test.py
 $PYT test.py
 
-
-cd $SRC/test
-python run_tests.py
-
-
-
 cd $SRC/test/quantix/
 echo `pwd` testfitfilt.py
 $PYT testfitfilt.py 
@@ -38,16 +34,15 @@ cd $SRC/test
 #python2.5 test_peaksearch.py ALL
 
 cd $SRC/test/ken_simul
-$PYT idx.py
+$PYT testken.py
+
 
 cd $SRC/test/
 $PYT testcol.py
 
 
-cd $SRC
-
-
 echo
 echo "Just finished testing ImageD11 from" $PYT
 echo "Using PYTHONPATH=" $PYTHONPATH
-$PYT -c "import ImageD11; print ImageD11.__version__"
+cd $SRC/test && $PYT -c 'import ImageD11, sys; sys.stdout.write(ImageD11.__version__+" "+ImageD11.__file__+"\n")'
+cd $SRC
diff --git a/todo.txt → docs/todo_historical.txt b/todo.txt → docs/todo_historical.txt
@@ -1,4 +1,10 @@
 
+# 25/07/2024
+
+Move this to docs.
+Now tracked in github issues.
+
+
 # 26-2-2019
 
 Overhaul or new package?

diff --git a/find_all_files_interfacing.py → sandbox/find_all_files_interfacing.py b/find_all_files_interfacing.py → sandbox/find_all_files_interfacing.py
@@ -1,11 +1,11 @@
 
-import os
+import os, sys
 
 apui = []
 syui = []
 noui = []
 
-root = "."
+root = sys.argv[1]
 for dirName, subdirList, fileList in os.walk(root):
     if True in [dirName.find(s)>=0 for s in ("__","build",".git",".vscode") ]:
         continue

diff --git a/test/run_tests.py b/test/run_tests.py
@@ -32,7 +32,7 @@
     "test_compress_duplicates",
     "eps_sig.test_eps",
     "test_finite_strain",
-    "test_stress"
+#    "test_stress",
     "test_fetch_data"
 ]
 
@@ -49,14 +49,15 @@
 
 for M in modules:
     os.chdir(HERE)
-    print("Running suite for ",M)
     MOD = importlib.import_module(M)
+    print("Running suite for ",M,MOD)
     if M.find(".")>-1 and 0:
         path = M.split(".")
         for direc in path[:-1]:
             os.chdir( direc )
         M = path[-1]
-    mySuite = unittest.loader.findTestCases( MOD )
+    # mySuite = unittest.loader.findTestCases( MOD )
+    mySuite = unittest.defaultTestLoader.loadTestsFromModule( MOD )
     runner = unittest.TextTestRunner()
     try:
         runner.run(mySuite)