From: Roland Mas Date: Wed, 23 Apr 2025 13:09:19 +0200 Subject: Fix paths --- mcstasscript/configuration.yaml | 8 ++++---- mcstasscript/interface/functions.py | 10 ++++------ mcstasscript/tests/test_Configurator.py | 19 +++++++------------ 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/mcstasscript/configuration.yaml b/mcstasscript/configuration.yaml index 008534d..9e72035 100644 --- a/mcstasscript/configuration.yaml +++ b/mcstasscript/configuration.yaml @@ -1,7 +1,7 @@ other: characters_per_line: 85 paths: - mcrun_path: /Applications/McStas-2.7.1.app/Contents/Resources/mcstas/2.7.1/bin/ - mcstas_path: /Applications/McStas-2.7.1.app/Contents/Resources/mcstas/2.7.1/ - mcxtrace_path: /Applications/McXtrace-1.5.app/Contents/Resources/mcxtrace/1.5/ - mxrun_path: /Applications/McXtrace-1.5.app/Contents/Resources/mcxtrace/1.5/bin/ + mcrun_path: /usr/bin + mcstas_path: /usr/share/mcstas/resources + mcxtrace_path: /usr/bin + mxrun_path: /usr/share/mcxtrace/resources diff --git a/mcstasscript/interface/functions.py b/mcstasscript/interface/functions.py index 7a98fa1..6bc5883 100644 --- a/mcstasscript/interface/functions.py +++ b/mcstasscript/interface/functions.py @@ -214,13 +214,11 @@ class Configurator: Writes a default configuration file to the package root directory """ - run = "/Applications/McStas-2.5.app/Contents/Resources/mcstas/2.5/bin/" - mcstas = "/Applications/McStas-2.5.app/Contents/Resources/mcstas/2.5/" + run = "/usr/bin" + mcstas = "/usr/share/mcstas/resources" - mxrun = "/Applications/McXtrace-1.5.app" \ - + "/Contents/Resources/mcxtrace/1.5/mxrun" - mcxtrace = "/Applications/McXtrace-1.5.app" \ - + "/Contents/Resources/mcxtrace/1.5/" + mxrun = "/usr/bin" + mcxtrace = "/usr/share/mcxtrace/resources" default_paths = {"mcrun_path": run, "mcstas_path": mcstas, diff --git a/mcstasscript/tests/test_Configurator.py b/mcstasscript/tests/test_Configurator.py index 42f6855..c13c5c1 100644 --- a/mcstasscript/tests/test_Configurator.py +++ b/mcstasscript/tests/test_Configurator.py @@ -14,7 +14,6 @@ def setup_expected_file(test_name): def setup_configurator(test_name): - setup_expected_file(test_name) return Configurator(test_name) @@ -62,12 +61,10 @@ class TestConfigurator(unittest.TestCase): default_config = my_configurator._read_yaml() - run = "/Applications/McStas-2.5.app/Contents/Resources/mcstas/2.5/bin/" - mcstas = "/Applications/McStas-2.5.app/Contents/Resources/mcstas/2.5/" - mxrun = "/Applications/McXtrace-1.5.app" \ - + "/Contents/Resources/mcxtrace/1.5/mxrun" - mcxtrace = "/Applications/McXtrace-1.5.app" \ - + "/Contents/Resources/mcxtrace/1.5/" + run = "/usr/bin" + mcstas = "/usr/share/mcstas/resources" + mxrun = "/usr/bin" + mcxtrace = "/usr/share/mcxtrace/resources" self.assertEqual(default_config["paths"]["mcrun_path"], run) self.assertEqual(default_config["paths"]["mcstas_path"], mcstas) @@ -135,8 +132,7 @@ class TestConfigurator(unittest.TestCase): new_config = my_configurator._read_yaml() - self.assertEqual(new_config["paths"]["mcstas_path"], - dummy_mcstas_path) + self.assertEqual(new_config["paths"]["mcstas_path"], dummy_mcstas_path) # remove the testing configuration file setup_expected_file(test_name) @@ -174,8 +170,7 @@ class TestConfigurator(unittest.TestCase): new_config = my_configurator._read_yaml() - self.assertEqual(new_config["paths"]["mcxtrace_path"], - dummy_mcstas_path) + self.assertEqual(new_config["paths"]["mcxtrace_path"], dummy_mcstas_path) # remove the testing configuration file setup_expected_file(test_name) @@ -197,5 +192,5 @@ class TestConfigurator(unittest.TestCase): setup_expected_file(test_name) -if __name__ == '__main__': +if __name__ == "__main__": unittest.main()