57 handle usage issues in aws env

src/pyholos/config.py

@@ -1,40 +1,43 @@
 import zipfile
+from os import environ
 from pathlib import Path
 
 DATE_FMT = "%Y-%m-%d"
 
-_PATH_HOLOS_SERVICE_RESOURCES = Path(__file__).parent / 'resources'
+_PATH_RESOURCES = Path(__file__).parent / 'resources'
+
+_PATH_RESOURCES_UNZIP: Path = _PATH_RESOURCES if (pth := environ.get('PATH_RESOURCES_UNZIP')) is None else Path(pth)
 
 
 def _ensure_resources_extracted():
     """Extract resource zip files if not already extracted."""
     # Extract HOLOS CLI if needed
-    holos_cli_zip = _PATH_HOLOS_SERVICE_RESOURCES / 'holos4_cli.zip'
-    holos_cli_dir = _PATH_HOLOS_SERVICE_RESOURCES / 'holos4_cli'
+    holos_cli_zip = _PATH_RESOURCES_UNZIP / 'holos4_cli.zip'
+    holos_cli_dir = _PATH_RESOURCES_UNZIP / 'holos4_cli'
     holos_cli_exe = holos_cli_dir / 'H.CLI.exe'
 
     if holos_cli_zip.exists() and not holos_cli_exe.exists():
         with zipfile.ZipFile(holos_cli_zip, 'r') as zip_ref:
-            zip_ref.extractall(_PATH_HOLOS_SERVICE_RESOURCES)
+            zip_ref.extractall(_PATH_RESOURCES_UNZIP)
 
     # Extract SLC data if needed
-    slc_zip = _PATH_HOLOS_SERVICE_RESOURCES / 'soil_landscapes_of_canada_v3r2.zip'
-    slc_dir = _PATH_HOLOS_SERVICE_RESOURCES / 'soil_landscapes_of_canada_v3r2'
+    slc_zip = _PATH_RESOURCES_UNZIP / 'soil_landscapes_of_canada_v3r2.zip'
+    slc_dir = _PATH_RESOURCES_UNZIP / 'soil_landscapes_of_canada_v3r2'
     slc_geojson = slc_dir / 'soil_landscapes_of_canada_v3r2.geojson'
 
     if slc_zip.exists() and not slc_geojson.exists():
         with zipfile.ZipFile(slc_zip, 'r') as zip_ref:
-            zip_ref.extractall(_PATH_HOLOS_SERVICE_RESOURCES)
+            zip_ref.extractall(_PATH_RESOURCES_UNZIP)
 
 
 # Auto-extract resources on import
 _ensure_resources_extracted()
 
-PATH_HOLOS_CLI = _PATH_HOLOS_SERVICE_RESOURCES / 'holos4_cli/H.CLI.exe'
+PATH_HOLOS_CLI = _PATH_RESOURCES_UNZIP / 'holos4_cli/H.CLI.exe'
 
 
 class PathsHolosResources:
-    _path_root = _PATH_HOLOS_SERVICE_RESOURCES / 'holos'
+    _path_root = _PATH_RESOURCES / 'holos'
     Table_Tillage_Factor = _path_root / (
         'Table_Tillage_Factor.csv')
     Table_6_Manure_Types_And_Default_Composition = _path_root / (
@@ -67,9 +70,12 @@ class PathsHolosResources:
 
 
 class PathsSlcData:
-    _path_root = _PATH_HOLOS_SERVICE_RESOURCES / 'soil_landscapes_of_canada_v3r2'
+    _path_root = _PATH_RESOURCES_UNZIP / 'soil_landscapes_of_canada_v3r2'
     geojson_file = _path_root / 'soil_landscapes_of_canada_v3r2.geojson'
     csv_dir = _path_root / 'soil_landscapes_of_canada_v3r2_csv'
     cmp_file = csv_dir / 'ca_all_slc_v3r2_cmp.csv'
     slt_file = csv_dir / 'ca_all_slc_v3r2_slt.csv'
     snt_file = csv_dir / 'ca_all_slc_v3r2_snt.csv'
+
+
+pass

src/pyholos/version.py

@@ -1,5 +1,6 @@
 major = 0
 minor = 2
 post = 1
+patch = "beta"
 
-__version__ = ".".join([str(s) for s in (major, minor, post)])
+__version__ = f'{major}.{minor}.{post}' + (f'.{patch}' if patch != "" else '')