From 3122dcae2041f3fd12bafdd8e25c27cd6577026b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:05:32 +0000 Subject: [PATCH 1/7] updated v3.2.4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9073a24..5e605a0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "mujoco" %} {% set namecxx = "libmujoco" %} {% set namepython = "mujoco-python" %} -{% set version = "3.2.0" %} +{% set version = "3.2.4" %} package: name: {{ name }} @@ -9,7 +9,7 @@ package: source: url: https://github.com/deepmind/mujoco/archive/refs/tags/{{ version }}.tar.gz - sha256: f389e786c143b4cba25c871695df0aed64736e78cbcc951815e934fdf7321d1d + sha256: 59d5d75dc66361aa3bdbdd409b96d7f6ecd86abcda06475233c796fc655b7b46 patches: - python_remove_avx.patch - cxx_devendor.patch @@ -29,7 +29,7 @@ source: build: # See https://github.com/conda-forge/mujoco-feedstock/issues/22 skip: true # [(aarch64 or ppc64le or osx) and python_impl == 'pypy'] - number: 2 + number: 0 outputs: - name: {{ namecxx }} From 01da3bab133b71ab7b104d4dd4fff403d11086d4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 21 Oct 2024 11:03:41 +0200 Subject: [PATCH 2/7] Update build_py.sh --- recipe/build_py.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/build_py.sh b/recipe/build_py.sh index 5ee8a5b..17ba434 100644 --- a/recipe/build_py.sh +++ b/recipe/build_py.sh @@ -6,6 +6,8 @@ if [[ "${target_platform}" == osx-* ]]; then fi cd $SRC_DIR/python +# Workaround for missing pxr import https://github.com/conda-forge/mujoco-feedstock/pull/62 +rm -rf ./mujoco/usd/exporter_test.py bash make_sdist.sh cd dist export MUJOCO_PATH=$PREFIX From f7f0021ed9e9897020ff78ffad9e6e42ddc6261a Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 21 Oct 2024 11:04:35 +0200 Subject: [PATCH 3/7] Update bld_py.bat --- recipe/bld_py.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/bld_py.bat b/recipe/bld_py.bat index 9667fbf..e2edc01 100644 --- a/recipe/bld_py.bat +++ b/recipe/bld_py.bat @@ -8,6 +8,8 @@ set CMAKE_GENERATOR_PLATFORM= set CMAKE_GENERATOR_TOOLSET= cd %SRC_DIR%\python +# Workaround for missing pxr import https://github.com/conda-forge/mujoco-feedstock/pull/62 +del /F .\mujoco\usd\exporter_test.py bash make_sdist.sh if errorlevel 1 exit 1 From c55fe5191d90c22d909e97b952bdb89c5833ffe1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 21 Oct 2024 11:30:53 +0200 Subject: [PATCH 4/7] Create 2160.patch --- recipe/2160.patch | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 recipe/2160.patch diff --git a/recipe/2160.patch b/recipe/2160.patch new file mode 100644 index 0000000..c8ddba5 --- /dev/null +++ b/recipe/2160.patch @@ -0,0 +1,48 @@ +From 3bd4ae216e986b8030b9c0cec2eacf12eae2cbeb Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Mon, 21 Oct 2024 11:25:28 +0200 +Subject: [PATCH] Fix running tests out of a installed mujoco python package + +--- + python/mujoco/specs_test.py | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/python/mujoco/specs_test.py b/python/mujoco/specs_test.py +index 84f10995be..9572a69ad6 100644 +--- a/python/mujoco/specs_test.py ++++ b/python/mujoco/specs_test.py +@@ -15,9 +15,11 @@ + """Tests for mjSpec bindings.""" + + import inspect ++import os + import textwrap + + from absl.testing import absltest ++from etils import epath + import mujoco + import numpy as np + +@@ -433,7 +435,9 @@ def test_kwarg(self): + ) + + def test_load_xml(self): +- filename = '../../test/testdata/model.xml' ++ filename = os.path.join( ++ epath.resource_path("mujoco"), "testdata", "model.xml" ++ ) + state_type = mujoco.mjtState.mjSTATE_INTEGRATION + + # Load from file. +@@ -692,8 +696,9 @@ def test_include(self): + mujoco.mjtGeom.mjGEOM_BOX) + + def test_delete(self): +- filename = '../../test/testdata/model.xml' +- ++ filename = os.path.join( ++ epath.resource_path("mujoco"), "testdata", "model.xml" ++ ) + spec = mujoco.MjSpec.from_file(filename) + + model = spec.compile() From f4b0553c0a963921f7ffe4372b315868175a2665 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 21 Oct 2024 11:31:07 +0200 Subject: [PATCH 5/7] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5e605a0..9254e0b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,6 +25,7 @@ source: - add_samples_prefix.patch - add_simulate_prefix.patch - 1477.patch + - 2160.patch build: # See https://github.com/conda-forge/mujoco-feedstock/issues/22 From 99fd7669b0f5919addce31e17c7d798045dbb994 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 21 Oct 2024 11:54:51 +0200 Subject: [PATCH 6/7] Update meta.yaml --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9254e0b..b974774 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -253,7 +253,8 @@ outputs: - pip commands: # pypy skipped as a workaround for https://github.com/conda-forge/mujoco-feedstock/issues/37 - - pytest --pyargs mujoco -v -k "not render" # [python_impl != 'pypy'] + # test_delete and test_load_xml disabled due to https://github.com/google-deepmind/mujoco/pull/2160 + - pytest --pyargs mujoco -v -k "not (render or test_delete or test_load_xml " # [python_impl != 'pypy'] - pip check about: home: https://github.com/deepmind/mujoco From 9a6a93503d001f36c08324e3d1c9f0be5bf68df7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 21 Oct 2024 12:40:23 +0200 Subject: [PATCH 7/7] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b974774..423e5e1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -254,7 +254,7 @@ outputs: commands: # pypy skipped as a workaround for https://github.com/conda-forge/mujoco-feedstock/issues/37 # test_delete and test_load_xml disabled due to https://github.com/google-deepmind/mujoco/pull/2160 - - pytest --pyargs mujoco -v -k "not (render or test_delete or test_load_xml " # [python_impl != 'pypy'] + - pytest --pyargs mujoco -v -k "not (render or test_delete or test_load_xml)" # [python_impl != 'pypy'] - pip check about: home: https://github.com/deepmind/mujoco