Fixed versioning and did a one liner that prevents documentation generation.

Author: Eli

schimpy/__init__.py

@@ -1,9 +1,19 @@
-"""Top-level package for schimpy."""
-
 __author__ = """Eli Ateljevich, Kijin Nam"""
 __email__ = "Eli.Ateljevich@water.ca.gov; Kijin.Nam@water.ca.gov"
 
 try:
-    from ._version import __version__
+    from importlib.metadata import version, PackageNotFoundError
 except ImportError:
-    __version__ = "0.0.0"  # fallback for weird dev cases
+    from pkg_resources import get_distribution, DistributionNotFound
+    def version(pkg): return get_distribution(pkg).version
+    PackageNotFoundError = DistributionNotFound
+
+try:
+    __version__ = version("schimpy")
+except PackageNotFoundError:
+    # Fallback for running from a VCS checkout without installation
+    try:
+        from setuptools_scm import get_version
+        __version__ = get_version(root="..", relative_to=__file__)
+    except Exception:
+        __version__ = "unknown"

schimpy/model_time.py

@@ -270,7 +270,6 @@ def file_to_elapsed(infile, start, outpath=None, annotate=False, skip_nan=False)
         prev_use = False
         prev_outline = None
         no_record = True
-<<<<<<< HEAD
         for iline, line in enumerate(thfile):
             if (
                 line
@@ -281,12 +280,6 @@ def file_to_elapsed(infile, start, outpath=None, annotate=False, skip_nan=False)
                     or line.startswith("time")
                 )
             ):
-=======
-        
-        
-        for iline,line in enumerate(thfile):
-            if line and len(line) > 1 and not (line.startswith("#") or line.startswith("date") or line.startswith("time")):
->>>>>>> ad36b55 (caching for stacked_dem_fill.py , bug fix on date formats for model_time.py, accelerate laplace_smooth_data.py, optimized raster_to_nodes.py)
                 splitline = line.split()
                 if skip_nan and splitline[-1] == "nan":
                     continue