avaframe 2.0a3__tar.gz → 2.0b2__tar.gz

{avaframe-2.0a3 → avaframe-2.0b2}/.gitignore

@@ -51,4 +51,6 @@ avaframe/com1DFA/*.so
 # see https://github.com/github/gitignore/blob/main/Python.gitignore
 *.py[cod]
 
-*.rcf
+*.rcf
+/avaframe/data/tmpStdTests/
+/wheelhouse/

{avaframe-2.0a3 → avaframe-2.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avaframe
-Version: 2.0a3
+Version: 2.0b2
 Summary: The Open Avalanche Framework
 Author-email: AvaFrame Contributors <felix@avaframe.org>
 License-Expression: EUPL-1.2
@@ -12,13 +12,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
+Requires-Python: <3.14,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: numpy<2.0
 Requires-Dist: salib<1.5.1
+Requires-Dist: pyshp<3.0
 Requires-Dist: matplotlib
-Requires-Dist: pyshp
 Requires-Dist: scipy
 Requires-Dist: cmcrameri
 Requires-Dist: seaborn

avaframe-2.0b2/avaframe/RELEASE-VERSION.txt

@@ -0,0 +1 @@
+2.0b2

{avaframe-2.0a3 → avaframe-2.0b2}/avaframe/ana4Stats/probAna.py

@@ -286,7 +286,7 @@ def updateCfgRange(cfg, cfgProb, varName, varDict):
 
 
 def checkParameterSettings(cfg, varParList):
-    """check if parameter settings in comMod configuration do not inlcude variation for parameters to be varied
+    """check if parameter settings in comMod configuration do not include variation for parameters to be varied
 
     Parameters
     -----------
@@ -821,6 +821,16 @@ def createSampleWithVariationForThParameters(
 
     # fetch input files and corresponding thickness info
     inputSimFiles = fetchThicknessInfo(avaDir)
+    fileTypeText = {".asc": "raster", ".tif": "raster", ".shp": "shapefile"}
+    for thFType in thReadFromShp:
+        if inputSimFiles["entResInfo"][thFType + "FileType"] != ".shp":
+            message = "%s file type: %s not a valid option for desired %s variation" % (
+                thFType,
+                fileTypeText[inputSimFiles["entResInfo"][thFType + "FileType"]],
+                thFType,
+            )
+            log.error(message)
+            raise AssertionError(message)
 
     paramValuesDList = []
     for iRel, relF in enumerate(inputSimFiles["relFiles"]):