Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade versions of numpy e.a. #32

Merged
merged 3 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions conda_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.10
- python=3.11
- mujoco=2.3.7
- loguru=0.7.0
- lxml=4.9.3
- numpy=1.21.6
- scipy=1.11.2
- scikit-learn=1.3.0
- 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.7.2
- matplotlib=3.8.4
- trimesh=3.23.5
- pyvista=0.41.1
- networkx=3.1
- fpdf2=2.7.5
- pyvista=0.43.5
- networkx=3.2.1
- fpdf2=2.7.8
- seaborn=0.12.2
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG PYTHON_VERSION="3.9"
ARG PYTHON_VERSION="3.11"
ARG VARIANT="-slim-bullseye"

FROM python:${PYTHON_VERSION}${VARIANT} as build
Expand Down Expand Up @@ -63,7 +63,7 @@ RUN set -ex \
&& pip install --upgrade pip \
&& pip install --no-cache-dir -r requirements.txt \
# Install Mambaforge
&& curl --location --silent --output ~/mamba-install.sh https://github.com/conda-forge/miniforge/releases/download/23.1.0-3/Mambaforge-23.1.0-3-$(uname)-$(uname -m).sh \
&& curl --location --silent --output ~/mamba-install.sh https://github.com/conda-forge/miniforge/releases/download/24.1.2-0/Mambaforge-24.1.2-0-$(uname)-$(uname -m).sh \
&& chmod +x ~/mamba-install.sh \
&& ~/mamba-install.sh -b -p ${MAMBAFORGE_HOME} \
# Set permissions on cache folder
Expand Down
2 changes: 1 addition & 1 deletion myoconverter/xml/bodies/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def copy_mesh_file(mesh_file, geometry_folder, output_geometry_folder):

# Convert into trimesh (see https://github.com/pyvista/pyvista/discussions/2268)
pymesh = pymesh.extract_surface().triangulate()
faces_as_array = pymesh.faces.reshape((pymesh.n_faces, 4))[:, 1:]
faces_as_array = pymesh.faces.reshape((pymesh.n_faces_strict, 4))[:, 1:]
tmesh = trimesh.Trimesh(pymesh.points, faces_as_array)

# Repair the mesh
Expand Down
Loading