ECOv003-L2T-STARS 1.2.0__tar.gz → 1.3.0__tar.gz

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Checkout repository
@@ -32,3 +32,8 @@ jobs:
       - name: Run tests
         run: |
           pytest
+        env:
+          PYTHONPATH: .
+          EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
+          EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
+          SKIP_EARTHDATA_LOGIN: "true"

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/L2T_STARS.py

@@ -259,7 +259,7 @@ def L2T_STARS(
             HLS_connection = HLS2CMR(
                 working_directory=working_directory,
                 download_directory=HLS_download_directory,
-                products_directory=HLS_products_directory,
+                # products_directory=HLS_products_directory,
                 target_resolution=target_resolution,
             )
         except CMRServerUnreachable as e:

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/LPDAAC/LPDAACDataPool.py

@@ -1,6 +1,5 @@
-import base64
+import netrc
 import hashlib
-import json
 import logging
 import os
 import posixpath
@@ -11,24 +10,27 @@ from datetime import date
 from fnmatch import fnmatch
 from http.cookiejar import CookieJar
 from os import makedirs, remove
-from os.path import abspath
 from os.path import dirname
 from os.path import exists
 from os.path import getsize
 from os.path import isdir
 from os.path import join
+from os.path import abspath
+from os.path import expanduser
 from time import sleep
 from typing import List, OrderedDict
-import netrc
+
 import requests
 import xmltodict
 from bs4 import BeautifulSoup
 from dateutil import parser
-from pycksum import cksum
+from ..cksum import cksum
 
 import colored_logging as cl
 
-from ECOv003_exit_codes import *
+
+class DownloadFailed(Exception):
+    pass
 
 CONNECTION_CLOSE = {
     "Connection": "close",
@@ -57,7 +59,7 @@ class LPDAACDataPool:
     DATE_REGEX = re.compile(r'^(19|20)\d\d[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$')
     DEFAULT_REMOTE = DEFAULT_REMOTE
 
-    def __init__(self, username: str = None, password: str = None, remote: str = None, offline_ok: bool = False):
+    def __init__(self, username: str = None, password: str = None, remote: str = None, offline_ok: bool = True):
         if remote is None:
             remote = DEFAULT_REMOTE
 
@@ -66,15 +68,14 @@ class LPDAACDataPool:
                 netrc_file = netrc.netrc()
                 username, _, password = netrc_file.authenticators("urs.earthdata.nasa.gov")
             except Exception as e:
-                logger.exception(e)
                 logger.warning("netrc credentials not found for urs.earthdata.nasa.gov")
 
         if username is None or password is None:
             if not "LPDAAC_USERNAME" in os.environ or not "LPDAAC_PASSWORD" in os.environ:
-                raise RuntimeError("Missing environment variable 'LPDAAC_USERNAME' or 'LPDAAC_PASSWORD'")
-
-            username = os.environ["LPDAAC_USERNAME"]
-            password = os.environ["LPDAAC_PASSWORD"]
+                logger.warning("missing environment variable 'LPDAAC_USERNAME' or 'LPDAAC_PASSWORD'")
+            else:
+                username = os.environ["LPDAAC_USERNAME"]
+                password = os.environ["LPDAAC_PASSWORD"]
 
         self._remote = remote
         self._username = username
@@ -86,14 +87,15 @@ class LPDAACDataPool:
 
         self._listings = {}
 
-        try:
-            self._authenticate()
-            self._check_remote()
-        except Exception as e:
-            if self.offline_ok:
-                logger.warning("unable to connect to LP-DAAC data pool")
-            else:
-                raise e
+        if not self.offline_ok:
+            try:
+                self._authenticate()
+                self._check_remote()
+            except Exception as e:
+                if self.offline_ok:
+                    logger.warning("unable to connect to LP-DAAC data pool")
+                else:
+                    raise e
 
     def _authenticate(self):
         try:
@@ -128,7 +130,7 @@ class LPDAACDataPool:
                 raise ConnectionError(message)
 
     def _check_remote(self):
-        logger.info(f"checking URL: {cl.URL(self.remote)}")
+        logger.debug(f"checking URL: {cl.URL(self.remote)}")
 
         try:
             response = requests.head(self.remote, headers=CONNECTION_CLOSE)
@@ -145,7 +147,7 @@ class LPDAACDataPool:
                 raise LPDAACServerUnreachable(message)
 
         if status == 200:
-            logger.info(
+            logger.debug(
                 "remote verified with status " + cl.val(200) +
                 " in " + cl.time(f"{duration:0.2f}") +
                 " seconds: " + cl.URL(self.remote))
@@ -307,7 +309,7 @@ class LPDAACDataPool:
         else:
             metadata_filename = f"{download_location}.xml"
 
-        makedirs(dirname(metadata_filename), exist_ok=True)
+        makedirs(abspath(dirname(expanduser(metadata_filename))), exist_ok=True)
 
         if XML_retries is None:
             XML_retries = XML_RETRIES
@@ -325,8 +327,8 @@ class LPDAACDataPool:
 
         while XML_retries > 0:
             XML_retries -= 1
-            command = f"wget -nc -c --user {self._username} --password {self._password} -O {metadata_filename} {metadata_URL}"
-            logger.info(command)
+            command = f"wget -nc -c --user {self._username} --password {self._password} -O {abspath(expanduser(metadata_filename))} {metadata_URL}"
+            # logger.info(command)
             os.system(command)
 
             if not exists(metadata_filename):
@@ -350,12 +352,12 @@ class LPDAACDataPool:
                 continue
 
             try:
-                with open(metadata_filename, "r") as file:
+                with open(abspath(expanduser(metadata_filename)), "r") as file:
                     metadata = xmltodict.parse(file.read())
             except Exception as e:
                 logger.warning(e)
                 logger.warning(f"unable to parse metadata file: {metadata_filename}")
-                os.remove(metadata_filename)
+                os.remove(abspath(expanduser(metadata_filename)))
                 logger.warning(f"waiting {XML_timeout_seconds} for retry")
                 sleep(XML_timeout_seconds)
                 continue
@@ -372,7 +374,7 @@ class LPDAACDataPool:
 
         logger.info(
             f"metadata retrieved {checksum_type} checksum: {cl.val(remote_checksum)} size: {cl.val(remote_filesize)} URL: {cl.URL(metadata_URL)}")
-        makedirs(dirname(filename), exist_ok=True)
+        makedirs(abspath(dirname(expanduser(filename))), exist_ok=True)
         logger.info(f"downloading {cl.URL(URL)} -> {cl.file(filename)}")
 
         # Use a temporary file for downloading
@@ -382,8 +384,8 @@ class LPDAACDataPool:
             download_retries -=1
 
             try:
-                if exists(temporary_filename):
-                    temporary_filesize = self.get_local_filesize(temporary_filename)
+                if exists(abspath(expanduser(temporary_filename))):
+                    temporary_filesize = self.get_local_filesize(abspath(expanduser(temporary_filename)))
 
                     if temporary_filesize > remote_filesize:
                         logger.warning(
@@ -391,11 +393,11 @@ class LPDAACDataPool:
                         remove(temporary_filename)
 
                     elif temporary_filesize == remote_filesize:
-                        local_checksum = self.get_local_checksum(temporary_filename, checksum_type=checksum_type)
+                        local_checksum = self.get_local_checksum(abspath(expanduser(temporary_filename)), checksum_type=checksum_type)
 
                         if local_checksum == remote_checksum:
                             try:
-                                shutil.move(temporary_filename, filename)
+                                shutil.move(abspath(expanduser(temporary_filename)), abspath(expanduser(filename)))
                             except Exception as e:
                                 if exists(filename):
                                     logger.warning(f"unable to move temporary file: {temporary_filename}")
@@ -408,27 +410,27 @@ class LPDAACDataPool:
                         else:
                             logger.warning(
                                 f"removing corrupted file with local checksum {local_checksum} and remote checksum {remote_checksum}: {temporary_filename}")
-                            remove(temporary_filename)
+                            remove(abspath(expanduser(temporary_filename)))
                     else:
                         logger.info(f"resuming incomplete download: {cl.file(temporary_filename)}")
 
-                command = f"wget -nc -c --user {self._username} --password {self._password} -O {temporary_filename} {URL}"
-                logger.info(command)
+                command = f"wget -nc -c --user {self._username} --password {self._password} -O {abspath(expanduser(temporary_filename))} {URL}"
+                # logger.info(command)
                 os.system(command)
 
-                if not exists(temporary_filename):
+                if not exists(abspath(expanduser(temporary_filename))):
                     raise ConnectionError(f"unable to download URL: {URL}")
 
-                local_filesize = self.get_local_filesize(temporary_filename)
-                local_checksum = self.get_local_checksum(temporary_filename, checksum_type=checksum_type)
+                local_filesize = self.get_local_filesize(abspath(expanduser(temporary_filename)))
+                local_checksum = self.get_local_checksum(abspath(expanduser(temporary_filename)), checksum_type=checksum_type)
 
                 if local_filesize != remote_filesize or local_checksum != remote_checksum:
-                    os.remove(temporary_filename)
+                    os.remove(abspath(expanduser(temporary_filename)))
                     raise ConnectionError(
                         f"removing corrupted file with local filesize {local_filesize} remote filesize {remote_filesize} local checksum {local_checksum} remote checksum {remote_checksum}: {temporary_filename}")
 
                 # Download successful, rename the temporary file to its proper name
-                shutil.move(temporary_filename, filename)
+                shutil.move(abspath(expanduser(temporary_filename)), abspath(expanduser(filename)))
 
                 logger.info(
                     f"successful download with filesize {cl.val(local_filesize)} checksum {cl.val(local_checksum)}: {cl.file(filename)}")

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/VIIRS/VNP09GA.py

@@ -24,10 +24,11 @@ from modland import generate_modland_grid
 
 from ECOv003_exit_codes import *
 
+from ..login import login
 from ..daterange import get_date
 from ..LPDAAC.LPDAACDataPool import RETRIES
 from .VIIRSDataPool import VIIRSGranule
-from .VIIRS_CMR_LOGIN import CMRServerUnreachable, VIIRS_CMR_login
+from ..exceptions import *
 
 NDVI_COLORMAP = LinearSegmentedColormap.from_list(
     name="NDVI",
@@ -1122,7 +1123,7 @@ class VNP09GA:
         self.products_directory = products_directory
         self.mosaic_directory = mosaic_directory
 
-        self.auth = VIIRS_CMR_login()
+        self.auth = login()
 
     def add_granules(self, granules: List[earthaccess.search.DataGranule]):
         data = pd.DataFrame([

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/__init__.py

@@ -1,3 +1,3 @@
 from .version import __version__, __author__
-from .ECOv003_L2T_STARS import *
+from .main import *
 from .ECOv003_DL import *

ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/cksum.py

@@ -0,0 +1,66 @@
+"""
+Pure Python implementation of POSIX cksum algorithm.
+
+This module provides a replacement for the pycksum package that is compatible
+with Python 3.12 and later versions.
+"""
+
+
+def cksum(data_or_file):
+    """
+    Calculate POSIX cksum checksum for data or file-like object.
+    
+    Args:
+        data_or_file: Either bytes data or a file-like object opened in binary mode
+        
+    Returns:
+        int: The POSIX cksum checksum value
+    """
+    # Handle file-like objects
+    if hasattr(data_or_file, 'read'):
+        data = data_or_file.read()
+    else:
+        data = data_or_file
+    
+    # Ensure we have bytes
+    if isinstance(data, str):
+        data = data.encode('utf-8')
+    
+    # Initialize CRC with 0
+    crc = 0
+    
+    # Process each byte of data
+    for byte in data:
+        # XOR the byte with the current CRC (shifted left 8 bits) 
+        crc ^= byte << 24
+        
+        # Process 8 bits
+        for _ in range(8):
+            if crc & 0x80000000:  # If MSB is set
+                crc = (crc << 1) ^ 0x04c11db7  # CRC-32 polynomial
+            else:
+                crc = crc << 1
+            crc &= 0xffffffff  # Keep it 32-bit
+    
+    # Append the length in bytes as a big-endian value
+    length = len(data)
+    length_bytes = []
+    while length > 0:
+        length_bytes.insert(0, length & 0xff)
+        length >>= 8
+    
+    # Process the length bytes
+    for byte in length_bytes:
+        crc ^= byte << 24
+        for _ in range(8):
+            if crc & 0x80000000:
+                crc = (crc << 1) ^ 0x04c11db7
+            else:
+                crc = crc << 1
+            crc &= 0xffffffff
+    
+    # Final XOR and return as signed 32-bit integer equivalent
+    result = crc ^ 0xffffffff
+    
+    # Convert to match expected return type (unsigned 32-bit integer)
+    return result

ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/exceptions.py

@@ -0,0 +1,2 @@
+class CMRServerUnreachable(Exception):
+    pass

ecov003_l2t_stars-1.2.0/ECOv003_L2T_STARS/install_STARS_jl.py → ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/install_STARSDataFusion_jl.py

@@ -3,11 +3,11 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-def install_STARS_jl(
-    github_URL: str = "https://github.com/STARS-Data-Fusion/STARS.jl",
+def install_STARSDataFusion_jl(
+    github_URL: str = "https://github.com/STARS-Data-Fusion/STARSDataFusion.jl",
     environment_name: str = "@ECOv003-L2T-STARS") -> subprocess.CompletedProcess:
     """
-    Installs the STARS.jl Julia package from GitHub into a specified Julia environment.
+    Installs the STARSDataFusion.jl Julia package from GitHub into a specified Julia environment.
 
     This function executes a Julia command to activate a given environment and
     then develops (installs in editable mode) the STARS.jl package from its
@@ -35,7 +35,7 @@ def install_STARS_jl(
 
     if result.returncode == 0:
         logger.info(
-            f"STARS.jl installed successfully in environment '{environment_name}'!"
+            f"STARSDataFusion.jl installed successfully in environment '{environment_name}'!"
         )
     else:
         logger.error("Error installing STARS.jl:")

ecov003_l2t_stars-1.2.0/ECOv003_L2T_STARS/instantiate_STARS_jl.py → ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/instantiate_STARSDataFusion_jl.py

@@ -3,11 +3,11 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-def instantiate_STARS_jl(package_location: str) -> subprocess.CompletedProcess:
+def instantiate_STARSDataFusion_jl(package_location: str) -> subprocess.CompletedProcess:
     """
     Activates a Julia project at a given location and instantiates its dependencies.
 
-    This is necessary to ensure all required Julia packages for STARS.jl are
+    This is necessary to ensure all required Julia packages for STARSDataFusion.jl are
     downloaded and ready for use within the specified project environment.
 
     Args:
@@ -30,7 +30,7 @@ def instantiate_STARS_jl(package_location: str) -> subprocess.CompletedProcess:
 
     if result.returncode == 0:
         logger.info(
-            f"STARS.jl instantiated successfully in directory '{package_location}'!"
+            f"STARSDataFusion.jl instantiated successfully in directory '{package_location}'!"
         )
     else:
         logger.error("Error instantiating STARS.jl:")

ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/login.py

@@ -0,0 +1,61 @@
+import logging
+import netrc
+import os
+
+import earthaccess
+
+from .exceptions import *
+
+__author__ = "Evan Davis"
+
+_AUTH = None
+
+def login() -> earthaccess.Auth:
+    """
+    Login to Earthdata using environment variables if available, falling back to netrc credentials, then interactive login.
+    """
+    # Only login to earthaccess once
+    global _AUTH
+    if _AUTH is not None:
+        return _AUTH
+
+    # Check if we're in a testing environment where authentication should be skipped
+    if os.environ.get("SKIP_EARTHDATA_LOGIN", "").lower() in ("true", "1", "yes"):
+        # Return a mock auth object for testing
+        class MockAuth:
+            def __init__(self):
+                self.authenticated = True
+        _AUTH = MockAuth()
+        return _AUTH
+
+    # Temporarily suppress INFO logs from earthaccess during login
+    earthaccess_logger = logging.getLogger('earthaccess')
+    original_level = earthaccess_logger.level
+    earthaccess_logger.setLevel(logging.WARNING)
+
+    try:
+        # First priority: environment variables
+        if "EARTHDATA_USERNAME" in os.environ and "EARTHDATA_PASSWORD" in os.environ:
+            _AUTH = earthaccess.login(strategy="environment")
+            return _AUTH
+
+        # Second priority: netrc credentials
+        try:
+            secrets = netrc.netrc()
+            auth = secrets.authenticators("urs.earthdata.nasa.gov")
+            if auth:
+                _AUTH = earthaccess.login(strategy="netrc")
+                return _AUTH
+        except (FileNotFoundError, netrc.NetrcParseError):
+            # .netrc file doesn't exist or is malformed, continue to interactive login
+            pass
+
+        # Last resort: interactive login
+        _AUTH = earthaccess.login(strategy="interactive")
+        return _AUTH
+
+    except Exception as e:
+        raise CMRServerUnreachable(e)
+    finally:
+        # Restore original logging level
+        earthaccess_logger.setLevel(original_level)

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/process_julia_data_fusion.py

@@ -4,7 +4,7 @@ from datetime import date
 from os.path import abspath, dirname, join, exists
 import logging
 
-from .instantiate_STARS_jl import instantiate_STARS_jl
+from .instantiate_STARSDataFusion_jl import instantiate_STARSDataFusion_jl
 
 logger = logging.getLogger(__name__)
 
@@ -71,7 +71,7 @@ def process_julia_data_fusion(
     STARS_source_directory = abspath(dirname(__file__))
 
     # Instantiate Julia dependencies
-    instantiate_STARS_jl(STARS_source_directory)
+    instantiate_STARSDataFusion_jl(STARS_source_directory)
 
     # Base Julia command with required arguments
     command = (

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv003-L2T-STARS
-Version: 1.2.0
+Version: 1.3.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
@@ -21,7 +21,6 @@ Requires-Dist: matplotlib
 Requires-Dist: modland
 Requires-Dist: numpy
 Requires-Dist: pandas
-Requires-Dist: pycksum
 Requires-Dist: pytictoc
 Requires-Dist: rasters
 Requires-Dist: scikit-image

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS.egg-info/SOURCES.txt

@@ -15,7 +15,6 @@ pyproject.toml
 .github/workflows/python-publish.yml
 ECOv003_L2T_STARS/ECOv003_DL.py
 ECOv003_L2T_STARS/ECOv003_DL.xml
-ECOv003_L2T_STARS/ECOv003_L2T_STARS.py
 ECOv003_L2T_STARS/ECOv003_L2T_STARS.xml
 ECOv003_L2T_STARS/L2TSTARSConfig.py
 ECOv003_L2T_STARS/L2T_STARS.py
@@ -23,7 +22,9 @@ ECOv003_L2T_STARS/Manifest.toml
 ECOv003_L2T_STARS/Project.toml
 ECOv003_L2T_STARS/__init__.py
 ECOv003_L2T_STARS/calibrate_fine_to_coarse.py
+ECOv003_L2T_STARS/cksum.py
 ECOv003_L2T_STARS/constants.py
+ECOv003_L2T_STARS/exceptions.py
 ECOv003_L2T_STARS/generate_L2T_STARS_runconfig.py
 ECOv003_L2T_STARS/generate_NDVI_coarse_directory.py
 ECOv003_L2T_STARS/generate_NDVI_coarse_image.py
@@ -38,9 +39,11 @@ ECOv003_L2T_STARS/generate_filename.py
 ECOv003_L2T_STARS/generate_input_staging_directory.py
 ECOv003_L2T_STARS/generate_model_state_tile_date_directory.py
 ECOv003_L2T_STARS/generate_output_directory.py
-ECOv003_L2T_STARS/install_STARS_jl.py
-ECOv003_L2T_STARS/instantiate_STARS_jl.py
+ECOv003_L2T_STARS/install_STARSDataFusion_jl.py
+ECOv003_L2T_STARS/instantiate_STARSDataFusion_jl.py
 ECOv003_L2T_STARS/load_prior.py
+ECOv003_L2T_STARS/login.py
+ECOv003_L2T_STARS/main.py
 ECOv003_L2T_STARS/prior.py
 ECOv003_L2T_STARS/process_ECOSTRESS_data_fusion_distributed_bias.jl
 ECOv003_L2T_STARS/process_STARS_product.py
@@ -65,7 +68,6 @@ ECOv003_L2T_STARS/LPDAAC/__init__.py
 ECOv003_L2T_STARS/LPDAAC/version.txt
 ECOv003_L2T_STARS/VIIRS/VIIRSDataPool.py
 ECOv003_L2T_STARS/VIIRS/VIIRSDownloader.py
-ECOv003_L2T_STARS/VIIRS/VIIRS_CMR_LOGIN.py
 ECOv003_L2T_STARS/VIIRS/VNP09GA.py
 ECOv003_L2T_STARS/VIIRS/VNP43IA4.py
 ECOv003_L2T_STARS/VIIRS/VNP43MA3.py
@@ -86,5 +88,5 @@ ECOv003_L2T_STARS/daterange/__init__.py
 ECOv003_L2T_STARS/daterange/daterange.py
 ECOv003_L2T_STARS/timer/__init__.py
 ECOv003_L2T_STARS/timer/timer.py
-tests/test_import_ECOv003_L3T_L4T_JET.py
+tests/test_import_ECOv003_L2T_STARS.py
 tests/test_import_dependencies.py

ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS.egg-info/entry_points.txt

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

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS.egg-info/requires.txt

@@ -10,7 +10,6 @@ matplotlib
 modland
 numpy
 pandas
-pycksum
 pytictoc
 rasters
 scikit-image

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv003-L2T-STARS
-Version: 1.2.0
+Version: 1.3.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
@@ -21,7 +21,6 @@ Requires-Dist: matplotlib
 Requires-Dist: modland
 Requires-Dist: numpy
 Requires-Dist: pandas
-Requires-Dist: pycksum
 Requires-Dist: pytictoc
 Requires-Dist: rasters
 Requires-Dist: scikit-image

ecov003_l2t_stars-1.3.0/makefile

@@ -0,0 +1,90 @@
+# Define package and environment variables
+PACKAGE_NAME = ECOv003-L2T-STARS
+ENVIRONMENT_NAME = $(PACKAGE_NAME)
+DOCKER_IMAGE_NAME = $(shell echo $(PACKAGE_NAME) | tr '[:upper:]' '[:lower:]')
+
+.PHONY: clean test build twine-upload dist install-package install uninstall reinstall environment remove-environment install-julia colima-start docker-build docker-build-environment docker-build-installation docker-interactive docker-remove
+
+# --- Cleaning and Maintenance ---
+
+clean:
+	@echo "Cleaning up build artifacts..."
+	rm -rf *.o *.out *.log
+	rm -rf build/
+	rm -rf dist/
+	rm -rf *.egg-info
+	rm -rf .pytest_cache
+	find . -type d -name "__pycache__" -exec rm -rf {} +
+
+# --- Testing ---
+
+test:
+	@echo "Running tests..."
+	PYTHONPATH=. pytest
+
+# --- Package Management ---
+
+build:
+	@echo "Building package..."
+	python -m build
+
+twine-upload:
+	@echo "Uploading package to PyPI..."
+	twine upload dist/*
+
+dist: clean build twine-upload
+	@echo "Distribution process complete."
+
+install-package:
+	@echo "Installing package in development mode..."
+	pip install -e .[dev]
+
+install: install-julia install-package
+	@echo "All installations complete."
+
+uninstall:
+	@echo "Uninstalling $(PACKAGE_NAME)..."
+	pip uninstall $(PACKAGE_NAME)
+
+reinstall: uninstall install
+	@echo "Package reinstalled."
+
+# --- Environment Management ---
+
+environment:
+	@echo "Creating mamba environment: $(ENVIRONMENT_NAME)..."
+	mamba create -y -n $(ENVIRONMENT_NAME) -c conda-forge python=3.11
+
+remove-environment:
+	@echo "Removing mamba environment: $(ENVIRONMENT_NAME)..."
+	mamba env remove -y -n $(ENVIRONMENT_NAME)
+
+install-julia:
+	@echo "Installing Julia packages..."
+	julia -e 'using Pkg; Pkg.add.(["Glob", "DimensionalData", "HTTP", "JSON", "ArchGDAL", "Rasters", "STARSDataFusion"]); Pkg.develop(path="ECOv003_L2T_STARS/VNP43NRT_jl")'
+
+# --- Docker & Colima ---
+
+colima-start:
+	@echo "Starting Colima..."
+	colima start -m 16 -a x86_64 -d 100
+
+docker-build:
+	@echo "Building Docker image: $(DOCKER_IMAGE_NAME):latest..."
+	docker build -t $(DOCKER_IMAGE_NAME):latest .
+
+docker-build-environment:
+	@echo "Building Docker environment target..."
+	docker build --target environment -t $(DOCKER_IMAGE_NAME):latest .
+
+docker-build-installation:
+	@echo "Building Docker installation target..."
+	docker build --target installation -t $(DOCKER_IMAGE_NAME):latest .
+
+docker-interactive:
+	@echo "Starting interactive Docker session..."
+	docker run -it $(DOCKER_IMAGE_NAME) fish
+
+docker-remove:
+	@echo "Removing Docker image: $(DOCKER_IMAGE_NAME)..."
+	docker rmi -f $(DOCKER_IMAGE_NAME)

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ECOv003-L2T-STARS"
-version = "1.2.0"
+version = "1.3.0"
 description = "ECOSTRESS Collection 3 JPL STARS Data Fusion Product Generating Executable (PGE)"
 readme = "README.md"
 authors = [
@@ -27,7 +27,6 @@ dependencies = [
     "modland",
     "numpy",
     "pandas",
-    "pycksum",
     "pytictoc",
     "rasters",
     "scikit-image",
@@ -61,5 +60,5 @@ include = ["ECOv003_L2T_STARS"]
 exclude = []
 
 [project.scripts]
-ECOv003-L2T-STARS = "ECOv003_L2T_STARS.ECOv003_L2T_STARS:main"
+ECOv003-L2T-STARS = "ECOv003_L2T_STARS.main:main"
 ECOv003-DL = "ECOv003_DL.ECOv003_DL:main"

{ecov003_l2t_stars-1.2.0 → ecov003_l2t_stars-1.3.0}/tests/test_import_dependencies.py

@@ -12,7 +12,6 @@ dependencies = [
     "modland",
     "numpy",
     "pandas",
-    "pycksum",
     "rasters",
     "skimage",
     "scipy",

ecov003_l2t_stars-1.2.0/ECOv003_L2T_STARS/VIIRS/VIIRS_CMR_LOGIN.py

@@ -1,36 +0,0 @@
-import netrc
-import os
-
-import earthaccess
-
-_AUTH = None
-
-class CMRServerUnreachable(Exception):
-    pass
-
-def VIIRS_CMR_login() -> earthaccess.Auth:
-    """
-    Login to Earthdata using netrc credentials if available, falling back to environment variables.
-    """
-    # Only login to earthaccess once
-    global _AUTH
-    if _AUTH is not None:
-        return _AUTH
-
-    try:
-        # Attempt to use netrc for credentials
-        secrets = netrc.netrc()
-        auth = secrets.authenticators("urs.earthdata.nasa.gov")
-        if auth:
-            _AUTH = earthaccess.login(strategy="netrc")  # Use strategy="netrc"
-            return _AUTH
-
-        # Fallback to environment variables if netrc fails
-        if "EARTHDATA_USERNAME" in os.environ and "EARTHDATA_PASSWORD" in os.environ:
-            _AUTH = earthaccess.login(strategy="environment")
-            return _AUTH
-        else:
-            raise CMRServerUnreachable("Missing netrc credentials or environment variables 'EARTHDATA_USERNAME' and 'EARTHDATA_PASSWORD'")
-
-    except Exception as e:
-        raise CMRServerUnreachable(e)

ecov003_l2t_stars-1.2.0/ECOv003_L2T_STARS.egg-info/entry_points.txt

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

ecov003_l2t_stars-1.2.0/makefile

@@ -1,66 +0,0 @@
-PACKAGE_NAME = ECOv003-L2T-STARS
-ENVIRONMENT_NAME = $(PACKAGE_NAME)
-DOCKER_IMAGE_NAME = $(shell echo $(PACKAGE_NAME) | tr '[:upper:]' '[:lower:]')
-
-clean:
-	rm -rf *.o *.out *.log
-	rm -rf build/
-	rm -rf dist/
-	rm -rf *.egg-info
-	rm -rf .pytest_cache
-	find . -type d -name "__pycache__" -exec rm -rf {} +
-
-test:
-	pytest
-
-build:
-	python -m build
-
-twine-upload:
-	twine upload dist/*
-
-dist:
-	make clean
-	make build
-	make twine-upload
-
-install-package:
-	pip install -e .[dev]
-
-install:
-	make install-julia
-	make install-package
-
-uninstall:
-	pip uninstall $(PACKAGE_NAME)
-
-reinstall:
-	make uninstall
-	make install
-
-environment:
-	mamba create -y -n $(ENVIRONMENT_NAME) -c conda-forge python=3.11
-
-remove-environment:
-	mamba env remove -y -n $(ENVIRONMENT_NAME)
-
-install-julia:
-    julia -e 'using Pkg; Pkg.add.(["Glob", "DimensionalData", "HTTP", "JSON", "ArchGDAL", "Rasters", "STARSDataFusion"]); Pkg.develop(path="ECOv003_L2T_STARS/VNP43NRT_jl")'
-
-colima-start:
-	colima start -m 16 -a x86_64 -d 100 
-
-docker-build:
-	docker build -t $(DOCKER_IMAGE_NAME):latest .
-
-docker-build-environment:
-	docker build --target environment -t $(DOCKER_IMAGE_NAME):latest .
-
-docker-build-installation:
-	docker build --target installation -t $(DOCKER_IMAGE_NAME):latest .
-
-docker-interactive:
-	docker run -it $(DOCKER_IMAGE_NAME) fish 
-
-docker-remove:
-	docker rmi -f $(DOCKER_IMAGE_NAME)