PyPI - ECOv003-L2T-STARS - Versions diffs - 1.6.0__tar.gz → 1.7.0__tar.gz - Mend

@@ -2,6 +2,7 @@ import subprocess
 from typing import Union
 from datetime import date
 from os.path import abspath, dirname, join, exists
+import os
 import logging
 from .instantiate_STARSDataFusion_jl import instantiate_STARSDataFusion_jl
@@ -75,16 +76,26 @@ def process_julia_data_fusion(
     if initialize_julia:
         instantiate_STARSDataFusion_jl(STARS_source_directory)
+    # Set up the environment for the julia script
+    julia_env = os.environ.copy()
+    julia_env["JULIA_NUM_THREADS"] = str(threads)
+    # Ensure that julia uses its own bundled GDAL instead of conda's GDAL
+    julia_env.pop("GDAL_DATA")
+    julia_env.pop("GDAL_DRIVER_PATH")
     # Base Julia command with required arguments
-    command = (
-        f'export JULIA_NUM_THREADS={threads}; julia --threads {threads} '
-        f'"{julia_script_filename}" {num_workers} "{tile}" "{coarse_cell_size}" '
-        f'"{fine_cell_size}" "{VIIRS_start_date}" "{VIIRS_end_date}" '
-        f'"{HLS_start_date}" "{HLS_end_date}" "{downsampled_directory}" '
-        f'"{product_name}" "{posterior_filename}" "{posterior_UQ_filename}" '
-        f'"{posterior_flag_filename}" "{posterior_bias_filename}" '
-        f'"{posterior_bias_UQ_filename}"'
-    )
+    command = [
+        "julia", "--threads", f"{threads}", julia_script_filename,
+        f"{num_workers}",
+        tile,
+        f"{coarse_cell_size}", f"{fine_cell_size}",
+        f"{VIIRS_start_date}", f"{VIIRS_end_date}",
+        f"{HLS_start_date}", f"{HLS_end_date}",
+        downsampled_directory, product_name,
+        posterior_filename, posterior_UQ_filename,
+        posterior_flag_filename,
+        posterior_bias_filename, posterior_bias_UQ_filename,
+    ]
     # Conditionally add prior arguments if all prior filenames are provided and exist
     if all(
@@ -99,14 +110,14 @@ def process_julia_data_fusion(
         ]
     ):
         logger.info("Passing prior into Julia data fusion system")
-        command += (
-            f' "{prior_filename}" "{prior_UQ_filename}" "{prior_bias_filename}" '
-            f'"{prior_bias_UQ_filename}"'
-        )
+        command += [
+            prior_filename, prior_UQ_filename,
+            prior_bias_filename, prior_bias_UQ_filename,
+        ]
     else:
         logger.info("No complete prior set found; running Julia data fusion without prior.")
-    logger.info(f"Executing Julia command: {command}")
-    # Execute the Julia command. Using shell=True as the command string includes shell syntax (export).
+    logger.info(f"Executing Julia command: {' '.join(command)}")
+    # Execute the Julia command, adding the environment changes
     # This assumes the Julia executable is in the system's PATH.
-    subprocess.run(command, shell=True, check=False)
+    subprocess.run(command, check=False, env=julia_env)

@@ -7,6 +7,7 @@ import sys
 from datetime import date, timedelta, datetime
 from glob import glob
 from os.path import abspath, expanduser, join, basename, splitext, exists, dirname
+import os
 from typing import Union, List
 import dateutil
 import numpy as np
@@ -115,9 +116,28 @@ def process_julia_BRDF(
     if initialize_julia:
         instantiate_VNP43NRT_jl(julia_source_directory)
-    command = f'julia "{julia_script_filename}" "{band}" "{h}" "{v}" "{tile_width_cells}" "{start_date:%Y-%m-%d}" "{end_date:%Y-%m-%d}" "{reflectance_directory}" "{solar_zenith_directory}" "{sensor_zenith_directory}" "{relative_azimuth_directory}" "{SZA_filename}" "{output_directory}"'
-    logger.info(command)
-    subprocess.run(command, shell=True)
+    # Set up the environment for the julia script
+    julia_env = os.environ.copy()
+    # Ensure that julia uses its own bundled GDAL instead of conda's GDAL
+    julia_env.pop("GDAL_DATA")
+    julia_env.pop("GDAL_DRIVER_PATH")
+    command = [
+        "julia", julia_script_filename,
+        band,
+        f"{h}", f"{v}",
+        f"{tile_width_cells}",
+        f"{start_date:%Y-%m-%d}", f"{end_date:%Y-%m-%d}",
+        reflectance_directory,
+        solar_zenith_directory,
+        sensor_zenith_directory,
+        relative_azimuth_directory,
+        SZA_filename,
+        output_directory,
+    ]
+    logger.info(" ".join(command))
+    subprocess.run(command, env=julia_env)
 class BRDFRetrievalFailed(RuntimeError):
     pass

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv003-L2T-STARS
-Version: 1.6.0
+Version: 1.7.0
 Summary: ECOSTRESS Collection 3 JPL STARS Data Fusion Product Generating Executable (PGE)
 Author-email: "Gregory H. Halverson" <gregory.h.halverson@jpl.nasa.gov>
 Project-URL: Homepage, https://github.com/ECOSTRESS-Collection-3/ECOv003-L2T-STARS

@@ -1,3 +1,3 @@
 [console_scripts]
-ECOv003-DL = ECOv003_DL.ECOv003_DL:main
+ECOv003-DL = ECOv003_L2T_STARS.ECOv003_DL:main
 ECOv003-L2T-STARS = ECOv003_L2T_STARS.main:main

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv003-L2T-STARS
-Version: 1.6.0
+Version: 1.7.0
 Summary: ECOSTRESS Collection 3 JPL STARS Data Fusion Product Generating Executable (PGE)
 Author-email: "Gregory H. Halverson" <gregory.h.halverson@jpl.nasa.gov>
 Project-URL: Homepage, https://github.com/ECOSTRESS-Collection-3/ECOv003-L2T-STARS

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "ECOv003-L2T-STARS"
-version = "1.6.0"
+version = "1.7.0"
 description = "ECOSTRESS Collection 3 JPL STARS Data Fusion Product Generating Executable (PGE)"
 readme = "README.md"
 authors = [
@@ -61,4 +61,4 @@ exclude = []
 [project.scripts]
 ECOv003-L2T-STARS = "ECOv003_L2T_STARS.main:main"
-ECOv003-DL = "ECOv003_DL.ECOv003_DL:main"
+ECOv003-DL = "ECOv003_L2T_STARS.ECOv003_DL:main"

ECOv003-L2T-STARS 1.6.0__tar.gz → 1.7.0__tar.gz

ECOv003-L2T-STARS 1.6.0tar.gz → 1.7.0tar.gz