From f2809c4d77d9eeee5fbb7f8f1f9fe7c685341976 Mon Sep 17 00:00:00 2001 From: Chris S W Davis Date: Wed, 15 Nov 2023 18:18:33 +0000 Subject: [PATCH] made error handling of missing magnetocosmics library slightly less harsh, so users can still import the library without major exceptions. --- AsympDirsCalculator/AsympDirsTools.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AsympDirsCalculator/AsympDirsTools.py b/AsympDirsCalculator/AsympDirsTools.py index be660d8..55e1be7 100644 --- a/AsympDirsCalculator/AsympDirsTools.py +++ b/AsympDirsCalculator/AsympDirsTools.py @@ -6,7 +6,7 @@ try: assert not (shutil.which("magnetocosmics") is None) except AssertionError: - raise Exception("ERROR: AsympDirsCalculator currently requires magnetocosmics to be installed, such that the command 'magnetocosmics' can be run in terminal. If you have installed a copy of magnetocosmics, please check to see ensure that your paths have been set correctly, and that magneto-env.sh has been sourced correctly. If you are having issues or suspect there might be a bug, please feel free to report it at https://github.com/ssc-maire/AsymptoticDirectionsCalculator-public/issues , and I will try to respond to your issue as soon as I'm able to.") + print("ERROR: AsympDirsCalculator currently requires magnetocosmics to be installed, such that the command 'magnetocosmics' can be run in terminal. All AsympDirsCalculator runs will currently fail until magnetocosmics is installed. If you have installed a copy of magnetocosmics, please check to see ensure that your paths have been set correctly, and that magneto-env.sh has been sourced correctly. If you are having issues or suspect there might be a bug, please feel free to report it at https://github.com/ssc-maire/AsymptoticDirectionsCalculator-public/issues , and I will try to respond to your issue as soon as I'm able to.") from .MAGNETOCOSMICSrunManager import MAGNETOCOSMICSrunManager diff --git a/setup.py b/setup.py index 98ebe64..bea5c7d 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ package_data={"AsympDirsCalculator":["magcos_running_scripts/runNoRewriteMAGCOSsimulation.sh", "magcos_running_scripts/AsymptoticDirection.g4mac", ]}, - version='1.0.5', + version='1.0.6', description='Python library containing tools for calculating asymptotic directions and vertical cut-off rigidities.', long_description=long_description, long_description_content_type='text/markdown',