avaframe 2.0b2__tar.gz → 2.0rc2__tar.gz

{avaframe-2.0b2 → avaframe-2.0rc2}/.github/workflows/buildAndUploadPyPi.yml

@@ -17,16 +17,20 @@ jobs:
 #        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-14]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
+      # - name: Install uv
+      #   uses: astral-sh/setup-uv@v7
+
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.0.0
+        uses: pypa/cibuildwheel@v3.4.0
         env:
           CIBW_PLATFORM: ${{ matrix.platform || 'auto' }}
+          # CIBW_BUILD_FRONTEND: "build[uv]"
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
@@ -35,12 +39,12 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.12
       - name: Install dependencies
@@ -58,7 +62,7 @@ jobs:
 #      - name: Build sdist
 #        run: pipx run build --sdist
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: cibw-sdist
           path: dist/*.tar.gz
@@ -73,7 +77,7 @@ jobs:
     # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
     # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           # unpacks all CIBW artifacts into dist/
           pattern: cibw-*

{avaframe-2.0b2 → avaframe-2.0rc2}/.qlty/qlty.toml

@@ -104,12 +104,8 @@ threshold = 10
 enabled = true
 
 [smells.function_complexity]
-threshold = 10
-enabled = true
-
-[smells.duplication]
+threshold = 15
 enabled = true
-threshold = 20
 
 [[source]]
 name = "default"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avaframe
-Version: 2.0b2
+Version: 2.0rc2
 Summary: The Open Avalanche Framework
 Author-email: AvaFrame Contributors <felix@avaframe.org>
 License-Expression: EUPL-1.2
@@ -16,13 +16,13 @@ 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: salib
+Requires-Dist: pyshp>=3.0.3
 Requires-Dist: matplotlib
 Requires-Dist: scipy
 Requires-Dist: cmcrameri
 Requires-Dist: seaborn
-Requires-Dist: cython
+Requires-Dist: cython>=3.0.10
 Requires-Dist: pandas
 Requires-Dist: shapely
 Requires-Dist: configUpdater

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

@@ -0,0 +1 @@
+2.0rc2

{avaframe-2.0b2 → avaframe-2.0rc2}/avaframe/ana1Tests/rotationTest.py

@@ -11,6 +11,7 @@ from datetime import datetime
 # Local imports
 # import config and init tools
 from avaframe.in3Utils import fileHandlerUtils as fU
+from avaframe.in3Utils import cfgUtils
 from avaframe.log2Report import generateReport as gR
 from avaframe.in3Utils import geoTrans as gT
 import avaframe.in2Trans.rasterUtils as IOf
@@ -63,7 +64,7 @@ def mainRotationTest(avalancheDir, energyLineTestCfg, com1DFACfg, dem, simDF, re
     fU.makeADir(outDir)
     # get reference angle
     simName = simDF.loc[refSimRowHash, 'simName']
-    relName = (simName.split('_'))[0]
+    relName = cfgUtils.parseSimName(simName)["releaseName"]
     thetaRef = float(relName[3:])
     for rowSimHash in simDF.index:
         # rotate results to be able to proceed to the aimec analysis
@@ -119,7 +120,7 @@ def rotateDFAResults(avalancheDir, simDF, rowSimHash, resTypeList, thetaRef, com
     """
     log.debug('Rotating simulation: %s' % rowSimHash)
     simName = simDF.loc[rowSimHash, 'simName']
-    relName = (simName.split('_'))[0]
+    relName = cfgUtils.parseSimName(simName)["releaseName"]
     theta = float(relName[3:])
     simDF.loc[rowSimHash, 'relAngle'] = theta
     thetaRot = theta - thetaRef

{avaframe-2.0b2 → avaframe-2.0rc2}/avaframe/ana1Tests/simiSolTest.py

@@ -57,7 +57,7 @@ def mainSimilaritySol(simiSolCfg):
     """
 
     # Load configuration
-    cfg = cfgUtils.getModuleConfig(com1DFA, simiSolCfg)
+    cfg = cfgUtils.getModuleConfig(com1DFA, fileOverride=simiSolCfg)
     cfgGen = cfg["GENERAL"]
     cfgSimi = cfg["SIMISOL"]
     bedFrictionAngleDeg = cfgSimi.getfloat("bedFrictionAngle")