constrained numpy version depending on python version

Author: davidpagnon

.github/workflows/continuous-integration.yml

@@ -53,6 +53,12 @@ jobs:
           python-version: ${{ matrix.python-version }}
           activate-environment: pose2sim
 
+      - name: Install OpenSim with conda
+        shell: bash -l {0}
+        run: |
+          conda install -n pose2sim -c conda-forge -c defaults pip
+          conda install -n pose2sim opensim-org::opensim -y
+
       - name: Cache pip dependencies
         uses: actions/cache@v4
         with:
@@ -68,12 +74,6 @@ jobs:
           conda run -n pose2sim python -m pip install flake8 pytest
           conda run -n pose2sim python -m pip install git+https://github.com/${{ github.repository }}.git@${{ github.sha }}
 
-      - name: Install OpenSim with conda
-        shell: bash -l {0}
-        run: |
-          conda install -n pose2sim -c conda-forge -c defaults pip
-          conda install -n pose2sim opensim-org::opensim -y
-
       - name: Lint with flake8
         shell: bash -l {0}
         run: |

Pose2Sim/markerAugmentation.py

@@ -166,7 +166,7 @@ def augment_markers_all(config_dict):
                     large_hip_knee_angles=large_hip_knee_angles,
                     trimmed_extrema_percent=trimmed_extrema_percent
                 )
-                if not np.isfinite(height):
+                if np.isfinite(height):
                     logging.info(f"Subject height automatically calculated for {os.path.basename(trc_file)}: {round(height,2)} m\n")
                 else:
                     logging.warning(f"Could not compute height from {os.path.basename(trc_file)}. Using default height of {default_height}m.")

pyproject.toml

@@ -34,7 +34,8 @@ classifiers = [
 urls = {Homepage = "https://github.com/perfanalytics/pose2sim", "Bug Tracker" = "https://github.com/perfanalytics/pose2sim/issues"}
 dependencies = [
     "toml",
-    "numpy",
+    "numpy<2.0; python_version<'3.12'",
+    "numpy>=2.0,<2.3; python_version>='3.12'",
     "lxml",
     "matplotlib",
     "mpl_interactions",