ECOv003-L2T-STARS 1.6.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

ECOv003_L2T_STARS/VNP43NRT/VNP43NRT.py

@@ -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

ECOv003_L2T_STARS/process_julia_data_fusion.py

@@ -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)

{ecov003_l2t_stars-1.6.0.dist-info → ecov003_l2t_stars-1.7.0.dist-info}/METADATA

@@ -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

{ecov003_l2t_stars-1.6.0.dist-info → ecov003_l2t_stars-1.7.0.dist-info}/RECORD

@@ -28,7 +28,7 @@ ECOv003_L2T_STARS/main.py,sha256=FjLTfN6tk-CaVBDwT5OlYxc8m-0bQZbniXx-6881MhA,605
 ECOv003_L2T_STARS/prior.py,sha256=fLE54pBIOG6sCas1G60nhn8LcHa2AqZ_eSY_J-MB4eM,2867
 ECOv003_L2T_STARS/process_ECOSTRESS_data_fusion_distributed_bias.jl,sha256=OuMd-Y_zNQJStecIPRwz9_5N5Loh8JVmkhBLFu1nlNs,16089
 ECOv003_L2T_STARS/process_STARS_product.py,sha256=KPzH28dR4bX966hVXRpupO8fxzxoiFwwYpf4lf7YE68,21948
-ECOv003_L2T_STARS/process_julia_data_fusion.py,sha256=lpChy2WJBQAvaJXa3PJFLwItQzlRqj1Z13EBaQLB40s,5341
+ECOv003_L2T_STARS/process_julia_data_fusion.py,sha256=LxHsmML_5OAo03v656bvGijf4-JvFXfdASezNztto5Q,5542
 ECOv003_L2T_STARS/retrieve_STARS_sources.py,sha256=jP4IXJK4XSYj4Yp0zfWIrYXTbHfGBvge0h2yEznIPNY,3802
 ECOv003_L2T_STARS/runconfig.py,sha256=TLaB3w6Y0qEZPqMa-YXuUzKSACrdpKmrozUNLh70aQw,1519
 ECOv003_L2T_STARS/version.py,sha256=CcCeNt2pNqb8AQ_vHLUbLJciE8hxTMeGmN79vAYObYQ,354
@@ -48,7 +48,7 @@ ECOv003_L2T_STARS/VIIRS/VNP43IA4.py,sha256=3qZbDHoLVhoiSr4hoojMxXXuDSNKkN4B9Dan-
 ECOv003_L2T_STARS/VIIRS/VNP43MA3.py,sha256=T_1mxdg_SII0vXp_D422aAU7fE0-7TY46IZzRJPGJ1Q,11043
 ECOv003_L2T_STARS/VIIRS/__init__.py,sha256=PVyb97Bg5gVMdcyC7JpErQCjJWSrOFdHJH4rNE__eL8,264
 ECOv003_L2T_STARS/VIIRS/version.txt,sha256=Ke8b6aOkBgjuceFV64cco0Yw4jvu6a8pRBq6nQ6nbVQ,5
-ECOv003_L2T_STARS/VNP43NRT/VNP43NRT.py,sha256=qC6Ufvn6lQwTzchLucLgPUZsaLbMqTLPqTpHRYZBZxo,31719
+ECOv003_L2T_STARS/VNP43NRT/VNP43NRT.py,sha256=2r8RYpu_RFizBuyEw-TH0DJWeSXa3ExfPB_FDrFUB44,32053
 ECOv003_L2T_STARS/VNP43NRT/__init__.py,sha256=8LkfUUFW0pyaO-1S134RnimfKYAKP6UfvzO7kPAx9mo,24
 ECOv003_L2T_STARS/VNP43NRT/process_VNP43NRT.jl,sha256=pNa5Z0RcyXSul2pysPwEWwl1e6XuTX_XURqgJIsVfT8,7139
 ECOv003_L2T_STARS/VNP43NRT/version.txt,sha256=atlhOkVXmNbZLl9fOQq0uqcFlryGntaxf1zdKyhjXwY,5
@@ -63,9 +63,9 @@ ECOv003_L2T_STARS/daterange/__init__.py,sha256=54kYb9tmsm5twxMqjJKeD__5kGkNDz3Pp
 ECOv003_L2T_STARS/daterange/daterange.py,sha256=EHa2Xt9fiJ1gbX7aa_QV_br1rAXjg3pHrLSRasOsOhM,959
 ECOv003_L2T_STARS/timer/__init__.py,sha256=I_MQKp_aamBLUzZv0psEbRgs6GZLOJd4mmJ7bli0Ikc,21
 ECOv003_L2T_STARS/timer/timer.py,sha256=tn5e3NQmsh55Jp9Fstjf-8KJW4F8UIJs-d_ZLooFYE8,1610
-ecov003_l2t_stars-1.6.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ecov003_l2t_stars-1.6.0.dist-info/METADATA,sha256=x7NYNmR2chp_QHoPbBTjIv_Rolxx8r1gLsaC08hyOV0,13283
-ecov003_l2t_stars-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecov003_l2t_stars-1.6.0.dist-info/entry_points.txt,sha256=EVVKltKsqXBc94JIu4IjVrMP0DPqaNEdQoAgcZOApQQ,106
-ecov003_l2t_stars-1.6.0.dist-info/top_level.txt,sha256=lRivA5MjbrabH4sv-LUstMGaLZ865wRQPpz9Kh6-plg,18
-ecov003_l2t_stars-1.6.0.dist-info/RECORD,,
+ecov003_l2t_stars-1.7.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ecov003_l2t_stars-1.7.0.dist-info/METADATA,sha256=7cCbJNsDumZKy9mbiHl1DVeuyIUNOonCc0jaC7i5OZQ,13283
+ecov003_l2t_stars-1.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecov003_l2t_stars-1.7.0.dist-info/entry_points.txt,sha256=w1SInJQvMFavgcUIWW1NLOygycIJpA86MZBKg74ZmiM,113
+ecov003_l2t_stars-1.7.0.dist-info/top_level.txt,sha256=lRivA5MjbrabH4sv-LUstMGaLZ865wRQPpz9Kh6-plg,18
+ecov003_l2t_stars-1.7.0.dist-info/RECORD,,

{ecov003_l2t_stars-1.6.0.dist-info → ecov003_l2t_stars-1.7.0.dist-info}/entry_points.txt

@@ -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