From 51198821af6ce26439f88ad45e58cfcf22bb1475 Mon Sep 17 00:00:00 2001 From: Raymond Menzel Date: Mon, 23 Dec 2024 10:39:48 -0500 Subject: [PATCH 1/2] try updating the imports --- catalogbuilder/scripts/gen_intake_gfdl.py | 17 +---------------- .../scripts/gen_intake_gfdl_runner.py | 2 +- .../scripts/gen_intake_gfdl_runner_config.py | 3 +-- catalogbuilder/scripts/gen_intake_s3.py | 3 +-- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/catalogbuilder/scripts/gen_intake_gfdl.py b/catalogbuilder/scripts/gen_intake_gfdl.py index 75c709e..1ae1e6b 100755 --- a/catalogbuilder/scripts/gen_intake_gfdl.py +++ b/catalogbuilder/scripts/gen_intake_gfdl.py @@ -6,27 +6,12 @@ import os from pathlib import Path import logging +from ..intakebuilder import gfdlcrawler, CSVwriter, builderconfig, configparser, getinfo logger = logging.getLogger('local') logger.setLevel(logging.INFO) logging.basicConfig(stream=sys.stdout) -try: - from catalogbuilder.intakebuilder import gfdlcrawler, CSVwriter, builderconfig, configparser, getinfo -except ModuleNotFoundError: - print("The module intakebuilder is not installed. Do you have intakebuilder in your sys.path or have you activated the conda environment with the intakebuilder package in it? ") - print("Attempting again with adjusted sys.path ") - try: - sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - except: - print("Unable to adjust sys.path") - #print(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - try: - from intakebuilder import gfdlcrawler, CSVwriter, builderconfig, configparser,getinfo - print(gfdlcrawler.__file__) - except ModuleNotFoundError: - sys.exit("The module 'intakebuilder' is still not installed. Do you have intakebuilder in your sys.path or have you activated the conda environment with the intakebuilder package in it? ") - package_dir = os.path.dirname(os.path.abspath(__file__)) #template_path = os.path.join(package_dir, '../cats/gfdl_template.json') diff --git a/catalogbuilder/scripts/gen_intake_gfdl_runner.py b/catalogbuilder/scripts/gen_intake_gfdl_runner.py index f30bcac..62d1239 100755 --- a/catalogbuilder/scripts/gen_intake_gfdl_runner.py +++ b/catalogbuilder/scripts/gen_intake_gfdl_runner.py @@ -1,7 +1,7 @@ #!/usr/bin/env python #TODO test after conda pkg is published and make changes as needed -from catalogbuilder.scripts import gen_intake_gfdl +from ..scripts import gen_intake_gfdl import sys input_path = "archive/am5/am5/am5f3b1r0/c96L65_am5f3b1r0_pdclim1850F/gfdl.ncrc5-deploy-prod-openmp/pp" diff --git a/catalogbuilder/scripts/gen_intake_gfdl_runner_config.py b/catalogbuilder/scripts/gen_intake_gfdl_runner_config.py index 81603f5..c0e3c4d 100755 --- a/catalogbuilder/scripts/gen_intake_gfdl_runner_config.py +++ b/catalogbuilder/scripts/gen_intake_gfdl_runner_config.py @@ -1,5 +1,4 @@ -import catalogbuilder -from catalogbuilder.scripts import gen_intake_gfdl +from ..scripts import gen_intake_gfdl import sys, os #This is an example call to run catalog builder using a yaml config file. diff --git a/catalogbuilder/scripts/gen_intake_s3.py b/catalogbuilder/scripts/gen_intake_s3.py index 5c8acbb..a26d069 100755 --- a/catalogbuilder/scripts/gen_intake_s3.py +++ b/catalogbuilder/scripts/gen_intake_s3.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import os -#from intakebuilder import getinfo, s3crawler, CSVwriter -from . import getinfo, s3crawler, CSVwriter +from ..intakebuilder import s3crawler, CSVwriter import logging logger = logging.getLogger('local') hdlr = logging.FileHandler('/Users/ar46/logs/local.log') From cf82ed1958350a8e7a5ab111cd4fc2a3b5bdc159 Mon Sep 17 00:00:00 2001 From: Raymond Menzel Date: Mon, 23 Dec 2024 11:24:27 -0500 Subject: [PATCH 2/2] fix the run call in the test --- .github/workflows/conda-env-create-run-pytest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-env-create-run-pytest.yml b/.github/workflows/conda-env-create-run-pytest.yml index 3c85a41..f7ba5fd 100644 --- a/.github/workflows/conda-env-create-run-pytest.yml +++ b/.github/workflows/conda-env-create-run-pytest.yml @@ -37,12 +37,12 @@ jobs: - name: Generate catalog run: | which python - python catalogbuilder/scripts/gen_intake_gfdl.py archive/am5/am5/am5f3b1r0/c96L65_am5f3b1r0_pdclim1850F/gfdl.ncrc5-deploy-prod-openmp/pp gfdl_autotest + python -m catalogbuilder.scripts.gen_intake_gfdl archive/am5/am5/am5f3b1r0/c96L65_am5f3b1r0_pdclim1850F/gfdl.ncrc5-deploy-prod-openmp/pp gfdl_autotest - name: Generate catalog with yaml run: | which python - python catalogbuilder/scripts/gen_intake_gfdl.py --config catalogbuilder/tests/test_config.yaml + python -m catalogbuilder.scripts.gen_intake_gfdl --config catalogbuilder/tests/test_config.yaml - name: upload-artifacts uses: actions/upload-artifact@v4