Skip to content

Commit

Permalink
fix import issue with wrapper and avoid sys.path adjustment.
Browse files Browse the repository at this point in the history
put back in sys import for yamltools
  • Loading branch information
ilaflott committed Aug 9, 2024
1 parent 054b059 commit 73a9286
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
1 change: 1 addition & 0 deletions fre/pp/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
''' for fre.pp imports '''

from .checkoutScript import checkoutTemplate
from .configure_script_yaml import yamlInfo
from .configure_script_xml import convert
Expand Down
20 changes: 10 additions & 10 deletions fre/pp/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
import click

# Import from the local packages
from checkoutScript import _checkoutTemplate
from configure_script_xml import _convert
from configure_script_yaml import _yamlInfo
from validate import _validate_subtool
from install import _install_subtool
from run import _pp_run_subtool
from status import _status_subtool
from .checkoutScript import _checkoutTemplate
from .configure_script_xml import _convert
from .configure_script_yaml import _yamlInfo
from .validate import _validate_subtool
from .install import _install_subtool
from .run import _pp_run_subtool
from .status import _status_subtool

#Add path to this file to the pythonpath for local imports
import_dir = os.path.dirname(os.path.abspath(__file__))
sys.path.append(import_dir)
##Add path to this file to the pythonpath for local imports
#import_dir = os.path.dirname(os.path.abspath(__file__))
#sys.path.append(import_dir)

@click.command()
def runFre2pp(experiment, platform, target, config_file, branch):
Expand Down
1 change: 1 addition & 0 deletions fre/yamltools/diag_table/is_valid_diag_table_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
Author: Uriel Ramirez 05/27/2022
"""

import sys
import argparse
import yaml

Expand Down

0 comments on commit 73a9286

Please sign in to comment.