ecopipeline 0.7.4__tar.gz → 0.7.6__tar.gz

{ecopipeline-0.7.4/src/ecopipeline.egg-info → ecopipeline-0.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecopipeline
-Version: 0.7.4
+Version: 0.7.6
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)

{ecopipeline-0.7.4 → ecopipeline-0.7.6}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ecopipeline
-version = 0.7.4
+version = 0.7.6
 authors = ["Carlos Bello, <bellocarlos@seattleu.edu>, Emil Fahrig <fahrigemil@seattleu.edu>, Casey Mang <cmang@seattleu.edu>, Julian Harris <harrisjulian@seattleu.edu>, Roger Tram <rtram@seattleu.edu>, Nolan Price <nolan@ecotope.com>"]
 description = Contains functions for use in Ecotope Datapipelines
 long_description = file: README.md

{ecopipeline-0.7.4 → ecopipeline-0.7.6}/src/ecopipeline/extract/extract.py

@@ -151,11 +151,17 @@ def extract_new(startTime: datetime, filenames: List[str], decihex = False, time
 
 
     else: 
+        endTime_int = endTime
         if epochFormat:
             startTime_int = int(startTime.timestamp())
+            if not endTime is None:
+                endTime_int = int(endTime.timestamp())
         else:
             startTime_int = int(startTime.strftime(dateFormat))
-        return_list = list(filter(lambda filename: int(filename[dateStringStartIdx:dateStringEndIdx]) >= startTime_int and (endTime is None or int(filename[dateStringStartIdx:dateStringStartIdx+14]) < int(endTime.strftime("%Y%m%d%H%M%S"))), filenames))
+            if not endTime is None:
+                endTime_int = int(endTime.strftime(dateFormat)
+                                  )
+        return_list = list(filter(lambda filename: int(filename[dateStringStartIdx:dateStringEndIdx]) >= startTime_int and (endTime_int is None or int(filename[dateStringStartIdx:dateStringEndIdx]) < endTime_int), filenames))
     return return_list
 
 def extract_files(extension: str, config: ConfigManager, data_sub_dir : str = "", file_prefix : str = "") -> List[str]:

{ecopipeline-0.7.4 → ecopipeline-0.7.6}/src/ecopipeline/utils/ConfigManager.py

@@ -28,7 +28,7 @@ class ConfigManager:
         Defaults to False
     """
     def __init__(self, config_file_path : str = "config.ini", input_directory : str = None, output_directory : str = None, data_directory : str = None, eco_file_structure : bool = False):
-        print(f"<<<========== CONFIGMANAGER INITIALIZED AT {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ==========>>>")
+        print(f"<<<==================== CONFIGMANAGER INITIALIZED AT {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ====================>>>")
         
         os.chdir(os.getcwd())
         

{ecopipeline-0.7.4 → ecopipeline-0.7.6/src/ecopipeline.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecopipeline
-Version: 0.7.4
+Version: 0.7.6
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)