Merge pull request #976 from mjuric/main

Bug fixes for issues found while conda packaging

demo/quicktest.sh

@@ -9,18 +9,21 @@
 
 set -e
 
-trap '{ rm -f quicktest-result.csv; } ' EXIT
+trap '{ rm -f quicktest-result.*; } ' EXIT
 
 test -d demo || { echo "$0 must be run from the top-level source code directory"; exit -1; }
 
-rm -f quicktest-result.csv
+rm -f quicktest-result.*
 
 sorcha bootstrap
-sorcha run -c ./demo/sorcha_config_demo.ini -p ./demo/sspp_testset_colours.txt -ob ./demo/sspp_testset_orbits.des -pd ./demo/baseline_v2.0_1yr.db -o ./ -t quicktest-result
+sorcha run -c ./demo/sorcha_config_demo.ini -p ./demo/sspp_testset_colours.txt -ob ./demo/sspp_testset_orbits.des -pd ./demo/baseline_v2.0_1yr.db -o ./ -t quicktest-result -st quicktest-result.stats
 
 # check that the output file size is larger than ~10k
 # (NOTE: this is just a rough check, we should test against known output here!)
 filesize=$(wc -c quicktest-result.csv | awk '{print $1}')
 test $filesize -gt 10000
 
+# check that the stats file exists
+test -f quicktest-result.stats.csv
+
 echo "Quick test succesful!"

pyproject.toml

@@ -43,7 +43,7 @@ sorcha-run = "sorcha_cmdline.run:main"
 sorcha-init = "sorcha_cmdline.init:main"
 sorcha-demo = "sorcha_cmdline.demo:main"
 sorcha-outputs = "sorcha_cmdline.outputs:main"
-sorcha-boostrap = "sorcha_cmdline.bootstrap:main"
+sorcha-bootstrap = "sorcha_cmdline.bootstrap:main"
 
 [project.urls]
 "Documentation" = "https://sorcha.readthedocs.io/en/latest/"

src/sorcha/modules/PPCommandLineParser.py

@@ -88,9 +88,10 @@ def PPCommandLineParser(args):
     cmd_args_dict["verbose"] = args.v
     cmd_args_dict["stats"] = args.st
 
-    warn_or_remove_file(
-        os.path.join(cmd_args_dict["outpath"], cmd_args_dict["stats"] + ".csv"), args.f, pplogger
-    )
+    if cmd_args_dict["stats"] is not None:
+        warn_or_remove_file(
+            os.path.join(cmd_args_dict["outpath"], cmd_args_dict["stats"] + ".csv"), args.f, pplogger
+        )
 
     cmd_args_dict["ar_data_path"] = args.ar  # default value for args.ar is `None`.
     if cmd_args_dict["ar_data_path"]: