Merge pull request #37 from MyoHub/feature/update-numpy

Update numpy to 1.23.5

.github/workflows/python-app.yml

@@ -1,12 +1,12 @@
 on:
   push:
-    branches: ["main", "dev*"]
+    branches: ["main", "dev*", " feature/*"]
     paths-ignore:
       - "doc/**"
       - "**/README.md"
 
   pull_request:
-    branches: ["main", "dev/*"]
+    branches: ["main", "dev/*", "feature/*"]
     paths-ignore:
       - "doc/**"
       - "**/README.md"
@@ -27,7 +27,7 @@ jobs:
       matrix:
         os: ["ubuntu-22.04"]
 #        os: ["ubuntu-22.04", "ubuntu-latest", "windows-latest"]
-        python-version: ["3.10"]
+        python-version: ["3.11"]
         include:
           - os: ubuntu-22.04
             use-mamba: false

conda_env.yml

@@ -1,21 +1,15 @@
-name: myoconverter
-channels:
-  - opensim-org
-  - anaconda
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.11
-  - mujoco=2.3.7
-  - loguru=0.7.2
-  - lxml=4.9.4
-  - numpy=1.23.5
-  - scipy=1.13.0
-  - scikit-learn=1.4.2
-  - opensim=4.4.1
-  - matplotlib=3.8.4
-  - trimesh=3.23.5
-  - pyvista=0.43.5
-  - networkx=3.2.1
-  - fpdf2=2.7.8
-  - seaborn=0.12.2
+name: myoconverter
+channels:
+  - anaconda
+  - defaults
+  - conda-forge
+dependencies:
+  - fpdf2=2.7.9
+  - matplotlib=3.9.1
+  - matplotlib-base=3.9.1
+  - mujoco=2.3.7
+  - numpy=1.23.5
+  - pandas=2.2.2
+  - pyqt=5.15.10
+  - python=3.10.14
+  - qt-main=5.15

docker/Dockerfile

@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
 
-ARG PYTHON_VERSION="3.11"
+ARG PYTHON_VERSION="3.10"
 ARG VARIANT="-slim-bullseye"
 
-FROM python:${PYTHON_VERSION}${VARIANT} as build
+FROM python:${PYTHON_VERSION}${VARIANT} AS build
 
 ENV PIP_DEFAULT_TIMEOUT=100 \
     # Allow statements and log messages to immediately appear
@@ -28,7 +28,7 @@ RUN apt-get update -y \
 
 
 ### Final stage
-FROM python:${PYTHON_VERSION}${VARIANT} as final
+FROM python:${PYTHON_VERSION}${VARIANT} AS final
 
 ENV MAMBAFORGE_HOME=/etc/mambaforge
 WORKDIR /app

myoconverter/tests/model_unit_test.py

@@ -28,4 +28,4 @@
 geometry_folder = './myoconverter/tests/resource/model_unit_test/osim/Arm26/Geometry'
 output_folder = './myoconverter/tests/resource/model_unit_test/mjc/Arm26'
 
-O2MPipeline(osim_file, geometry_folder, output_folder, **kwargs)
+O2MPipeline(osim_file, geometry_folder, output_folder, **kwargs)

pyproject.toml

@@ -6,19 +6,19 @@ authors = ["Your Name <[email protected]>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.13"
-loguru = "^0.7.0"
-lxml = "^4.9.2"
-numpy = "<1.24"
-scipy = "^1.11.1"
-scikit-learn = "^1.3.0"
-matplotlib = "^3.7.1"
-trimesh = "^3.22.3"
-pyvista = "0.43.5"
-networkx = "^3.1"
-fpdf2 = "^2.7.4"
-seaborn = "^0.12.2"
-mujoco = "^2.3.6"
+python = "^3.10"
+numpy = "==1.23.5"
+mujoco = "==2.3.6"
+lxml = "^5.2.2"
+loguru = "^0.7.2"
+scipy = "^1.14.0"
+scikit-learn = "^1.5.1"
+matplotlib = "^3.9.1"
+trimesh = "^4.4.3"
+pyvista = "^0.44.1"
+networkx = "^3.3"
+fpdf2 = "^2.7.9"
+seaborn = "^0.13.2"
 
 
 [build-system]