Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fre pp convert: Remove unneeded check for PATH. #47

Merged
merged 1 commit into from
Mar 18, 2024
Merged

fre pp convert: Remove unneeded check for PATH. #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions fre/frepp/configureScriptXML.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
#

LOGGING_FORMAT = '%(asctime)s %(levelname)s: %(message)s'
FRE_PATH = '/home/fms/local/opt/fre-commands/bronx-21/bin'
FRE_TEST_PATH = '/home/fms/local/opt/fre-commands/test/bin'
CYLC_PATH = '/home/fms/fre-canopy/system-settings/bin'
CYLC_REFINED_SCRIPTS = ["check4ptop.pl",
"module_init_3_1_6.pl",
Expand Down Expand Up @@ -573,14 +571,9 @@ def convert(xml, platform, target, experiment, do_analysis, historydir, refinedi
##########################################################################


##########################################################################
# Check the OS environment. Exit if FRE has not been loaded or Cylc has
# not been loaded (if using the --validate option).
##########################################################################
if not(FRE_PATH in os.getenv('PATH') or FRE_TEST_PATH in os.getenv('PATH')):
raise EnvironmentError("Cannot run the XML converter because FRE Bronx " \
"isn't loaded. Please load the latest FRE Bronx " \
"module and try again.")
# NOTE: Ideally we would check that "frelist" is in the PATH here,
# but in practice the frelist will just fail later if it's not loaded.
# If that error scenario is too confusing, let's add a check back here.

if validate:
if CYLC_PATH in os.getenv('PATH'):
Expand Down
Loading