From 519dcc15b06469563feff8e39fc9c30505681c96 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:30:35 +0000 Subject: [PATCH 01/23] updated v1.0.0 --- recipe/meta.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 11dd07e..f3ea494 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,5 @@ -{% set version = "0.29.1" %} +{% set tests_to_skip = "_not_a_real_test" %} +{% set version = "1.0.0" %} package: name: gymnasium-split @@ -6,13 +7,13 @@ package: source: url: https://github.com/Farama-Foundation/Gymnasium/archive/refs/tags/v{{ version }}.tar.gz - sha256: 0bff5ff33335ffe170f9ccba544f7c4d78e7b4dd883337f2ee00f8ba3c6d85b5 + sha256: d61a54c70d1960a0b64c63fe87edc30a0bac09551c27d8d94c36c54bf5fae5d9 patches: # https://github.com/Farama-Foundation/Gymnasium/pull/932 - patches/932.patch build: - number: 1 + number: 0 # Need these up here for conda-smithy to handle them properly. requirements: From 72545aa60e32b5d9bf297fda7e240d63fbf5f885 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:32:22 +0000 Subject: [PATCH 02/23] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.08.09.45.19 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ------ .azure-pipelines/azure-pipelines-osx.yml | 8 +--- .azure-pipelines/azure-pipelines-win.yml | 5 +-- ...ux_64_numpy1.22python3.10.____cpython.yaml | 8 +--- ...nux_64_numpy1.22python3.8.____cpython.yaml | 27 ------------ ...nux_64_numpy1.22python3.9.____cpython.yaml | 8 +--- ...ux_64_numpy1.23python3.11.____cpython.yaml | 8 +--- ...ux_64_numpy1.26python3.12.____cpython.yaml | 8 +--- ...rch64_numpy1.22python3.10.____cpython.yaml | 6 --- ...arch64_numpy1.22python3.8.____cpython.yaml | 31 -------------- ...arch64_numpy1.22python3.9.____cpython.yaml | 6 --- ...rch64_numpy1.23python3.11.____cpython.yaml | 6 --- ...rch64_numpy1.26python3.12.____cpython.yaml | 6 --- ...c64le_numpy1.22python3.10.____cpython.yaml | 6 --- ...pc64le_numpy1.22python3.8.____cpython.yaml | 27 ------------ ...pc64le_numpy1.22python3.9.____cpython.yaml | 6 --- ...c64le_numpy1.23python3.11.____cpython.yaml | 6 --- ...c64le_numpy1.26python3.12.____cpython.yaml | 6 --- ...sx_64_numpy1.22python3.10.____cpython.yaml | 8 ++-- ...osx_64_numpy1.22python3.8.____cpython.yaml | 25 ----------- ...osx_64_numpy1.22python3.9.____cpython.yaml | 8 ++-- ...sx_64_numpy1.23python3.11.____cpython.yaml | 8 ++-- ...sx_64_numpy1.26python3.12.____cpython.yaml | 8 ++-- ...arm64_numpy1.22python3.10.____cpython.yaml | 4 +- ..._arm64_numpy1.22python3.8.____cpython.yaml | 25 ----------- ..._arm64_numpy1.22python3.9.____cpython.yaml | 4 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 4 +- ...arm64_numpy1.26python3.12.____cpython.yaml | 4 +- ...in_64_numpy1.22python3.10.____cpython.yaml | 2 - ...win_64_numpy1.22python3.8.____cpython.yaml | 19 --------- ...win_64_numpy1.22python3.9.____cpython.yaml | 2 - ...in_64_numpy1.23python3.11.____cpython.yaml | 2 - ...in_64_numpy1.26python3.12.____cpython.yaml | 2 - .gitattributes | 4 +- .scripts/build_steps.sh | 14 ++++++- .scripts/run_osx_build.sh | 9 +++- .scripts/run_win_build.bat | 9 +++- README.md | 42 ------------------- build-locally.py | 9 ++-- 39 files changed, 58 insertions(+), 344 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/win_64_numpy1.22python3.8.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 215ce6d..0396e75 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,10 +12,6 @@ jobs: CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.8.____cpython: - CONFIG: linux_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.22python3.9.____cpython: CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -32,10 +28,6 @@ jobs: CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.22python3.9.____cpython: CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -52,10 +44,6 @@ jobs: CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.22python3.9.____cpython: CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e810526..820e715 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,15 +5,12 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_numpy1.22python3.10.____cpython: CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.8.____cpython: - CONFIG: osx_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.9.____cpython: CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -26,9 +23,6 @@ jobs: osx_arm64_numpy1.22python3.10.____cpython: CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.8.____cpython: - CONFIG: osx_arm64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.9.____cpython: CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ffb38f2..41bb8c8 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,9 +11,6 @@ jobs: win_64_numpy1.22python3.10.____cpython: CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.8.____cpython: - CONFIG: win_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.22python3.9.____cpython: CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -36,7 +33,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 087926b..87a6b7d 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -21,7 +17,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 74df83f..0000000 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 0ab655a..a00da4e 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -21,7 +17,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 18b7638..8ae2a28 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -21,7 +17,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index c44e431..04b325b 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -21,7 +17,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 9ac7d4e..242af8d 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -25,7 +21,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 0a648d7..0000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index a6af130..eeef165 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -25,7 +21,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 8b674f2..ae7553c 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -25,7 +21,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index e3908e5..20a3002 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -25,7 +21,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 76f018e..f6cbb84 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -21,7 +17,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 14a2bf3..0000000 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 1b7a62f..069869f 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -21,7 +17,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 764520b..cece199 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -21,7 +17,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 559b617..b3a3d1d 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -21,7 +17,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 4768728..41f3066 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index bafa800..0000000 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,25 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 8932f19..ed88a2e 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 988b74b..db887b4 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 43bec21..9e7368d 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 05cd452..841f52d 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index f808651..0000000 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,25 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index c47f63c..7ca846e 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 7f3fdcc..d235510 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index f9b139c..1e831e4 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 4c30362..81093c8 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,3 @@ -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 4378d44..0000000 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,19 +0,0 @@ -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 990c12d..843f352 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 34f8862..4801c49 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,3 @@ -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index 0d0a1b1..9729d64 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -1,5 +1,3 @@ -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 238aa87..9e338ca 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,13 +43,19 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup +( +# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm +# are drastically slowed down when the number of file descriptors is very high. +# This can be visible during a `yum install` step of a feedstock build. +# => Set a lower limit in a subshell for the `yum install`s only. +ulimit -n 1024 # Install the yum requirements defined canonically in the # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. /usr/bin/sudo -n yum install -y mesa-libGL mesa-libEGL libglvnd-egl libglvnd-glx libglvnd-opengl - +) # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -80,6 +86,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d54697..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index 146ed1f..9aeebe8 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,6 @@ Current build status variant - - linux_64_numpy1.22python3.8.____cpython - - - variant - - linux_64_numpy1.22python3.9.____cpython @@ -70,13 +63,6 @@ Current build status variant - - linux_aarch64_numpy1.22python3.8.____cpython - - - variant - - linux_aarch64_numpy1.22python3.9.____cpython @@ -105,13 +91,6 @@ Current build status variant - - linux_ppc64le_numpy1.22python3.8.____cpython - - - variant - - linux_ppc64le_numpy1.22python3.9.____cpython @@ -140,13 +119,6 @@ Current build status variant - - osx_64_numpy1.22python3.8.____cpython - - - variant - - osx_64_numpy1.22python3.9.____cpython @@ -175,13 +147,6 @@ Current build status variant - - osx_arm64_numpy1.22python3.8.____cpython - - - variant - - osx_arm64_numpy1.22python3.9.____cpython @@ -210,13 +175,6 @@ Current build status variant - - win_64_numpy1.22python3.8.____cpython - - - variant - - win_64_numpy1.22python3.9.____cpython diff --git a/build-locally.py b/build-locally.py index e0d408d..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From 0ef9190a207ed9edab4bcf5d42fcd2ef3a7a9b05 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 8 Oct 2024 15:45:36 +0200 Subject: [PATCH 03/23] Update for 1.0.0 release --- recipe/meta.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f3ea494..bf7a108 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,9 +8,6 @@ package: source: url: https://github.com/Farama-Foundation/Gymnasium/archive/refs/tags/v{{ version }}.tar.gz sha256: d61a54c70d1960a0b64c63fe87edc30a0bac09551c27d8d94c36c54bf5fae5d9 - patches: - # https://github.com/Farama-Foundation/Gymnasium/pull/932 - - patches/932.patch build: number: 0 @@ -41,6 +38,7 @@ outputs: host: - python - pip + - setuptools - cloudpickle >=1.2.0 - numpy run: @@ -146,10 +144,7 @@ outputs: run: - python - {{ pin_subpackage('gymnasium', exact=True) }} - - cython <3 - # Maximum version of mujoco constraint required due to https://github.com/Farama-Foundation/Gymnasium/issues/749#issuecomment-1808355111, - # remove once gymnasium v1.0.0 is released - - mujoco-python >=2.3.3,<3.0.0 + - mujoco-python - imageio >=2.14.1 test: imports: From 63ff433a5f70b438226c475e8e3711d468df8866 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 8 Oct 2024 15:45:49 +0200 Subject: [PATCH 04/23] Delete recipe/patches/932.patch --- recipe/patches/932.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 recipe/patches/932.patch diff --git a/recipe/patches/932.patch b/recipe/patches/932.patch deleted file mode 100644 index 3ae1448..0000000 --- a/recipe/patches/932.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gymnasium/spaces/multi_discrete.py b/gymnasium/spaces/multi_discrete.py -index 09f930ff8..caf488764 100644 ---- a/gymnasium/spaces/multi_discrete.py -+++ b/gymnasium/spaces/multi_discrete.py -@@ -172,7 +172,7 @@ def from_jsonable( - self, sample_n: list[Sequence[int]] - ) -> list[NDArray[np.integer[Any]]]: - """Convert a JSONable data type to a batch of samples from this space.""" -- return [np.array(sample) for sample in sample_n] -+ return [np.array(sample, dtype=np.int64) for sample in sample_n] - - def __repr__(self): - """Gives a string representation of this space.""" From acc376a6fa1f617fb87d10065a6d5b8e8ffd79e4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 8 Oct 2024 16:29:36 +0200 Subject: [PATCH 05/23] Comment pip check for now --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bf7a108..41bdeea 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,7 +78,8 @@ outputs: - jax >=0.4 # [osx or linux64] - mesalib # [linux] commands: - - pip check + # Uncomment when https://github.com/conda-forge/proglog-feedstock/pull/3 is merged + # - pip check {% set tests_to_skip = "_not_a_real_test" %} # the following pygame tests are skipped [according to selector], because there is no rendering support during the CI build {% set tests_to_skip = tests_to_skip + " or test_human_rendering" %} # [osx] From caef52492d91949bb3a741aaa1b542bc86491d72 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 8 Oct 2024 22:27:27 +0200 Subject: [PATCH 06/23] Add flax dependency --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 41bdeea..8fdf297 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,6 +76,7 @@ outputs: - scipy - pip - jax >=0.4 # [osx or linux64] + - flax >=0.5.0 # [osx or linux64] - mesalib # [linux] commands: # Uncomment when https://github.com/conda-forge/proglog-feedstock/pull/3 is merged From ebeb18c9dfcd5ae57674a762e8098c52ac025045 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 8 Oct 2024 23:06:46 +0200 Subject: [PATCH 07/23] Add missing test dependency dill --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8fdf297..20b4f0f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -74,6 +74,7 @@ outputs: - mock - pytest - scipy + - dill - pip - jax >=0.4 # [osx or linux64] - flax >=0.5.0 # [osx or linux64] From ac9e3234318128b99da9e33af9b9baae552b7ea2 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 8 Oct 2024 23:42:51 +0200 Subject: [PATCH 08/23] 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 20b4f0f..fb9b827 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -100,7 +100,8 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_render_modes" %} # [aarch64] # need to specify opengl driver on linux to enable offscreen rendering in MuJoCo - export MUJOCO_GL="osmesa" # [linux] - - pytest -v tests/ -k "not ({{ tests_to_skip }})" + # atary test are skipped as we do not have atari ROMs in the CI + - pytest --ignore-glob='*atari*'. -v tests/ -k "not ({{ tests_to_skip }})" - name: gymnasium-atari requirements: From e60f29b534e957a06a00536550de635a0886eeaf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 9 Oct 2024 00:12:08 +0200 Subject: [PATCH 09/23] 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 fb9b827..786dbea 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -101,7 +101,8 @@ outputs: # need to specify opengl driver on linux to enable offscreen rendering in MuJoCo - export MUJOCO_GL="osmesa" # [linux] # atary test are skipped as we do not have atari ROMs in the CI - - pytest --ignore-glob='*atari*'. -v tests/ -k "not ({{ tests_to_skip }})" + - rm tests/wrappers/test_atari_preprocessing.py # [unix] + - pytest -v tests/ -k "not ({{ tests_to_skip }})" - name: gymnasium-atari requirements: From 9256cd84b2e080b9fd7e37101c7a5e020404d44b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 9 Oct 2024 10:18:33 +0200 Subject: [PATCH 10/23] Skip tests that fail just in CI --- recipe/meta.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 786dbea..1d6a3e5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -83,6 +83,22 @@ outputs: # Uncomment when https://github.com/conda-forge/proglog-feedstock/pull/3 is merged # - pip check {% set tests_to_skip = "_not_a_real_test" %} + # These test requires mujoco_py, see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124082918 + {% set tests_to_skip = tests_to_skip + " or test_verify_info_x_position" %} + {% set tests_to_skip = tests_to_skip + " or test_verify_info_y_position" %} + {% set tests_to_skip = tests_to_skip + " or test_verify_info_x_velocity" %} + {% set tests_to_skip = tests_to_skip + " or test_verify_info_y_velocity" %} + {% set tests_to_skip = tests_to_skip + " or test_verify_info_xy_velocity_xpos" %} + {% set tests_to_skip = tests_to_skip + " or test_verify_info_xy_velocity_com" %} + {% set tests_to_skip = tests_to_skip + " or test_set_state" %} + {% set tests_to_skip = tests_to_skip + " or test_distance_from_origin_info" %} + {% set tests_to_skip = tests_to_skip + " or test_model_sensors" %} + {% set tests_to_skip = tests_to_skip + " or test_reset_noise_scale" %} + # These tests do not run on CI due to missing window system, see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124183361 + {% set tests_to_skip = tests_to_skip + " or test_max_geom_attribute[10-human]" %} + {% set tests_to_skip = tests_to_skip + " or test_max_geom_attribute[100-human]" %} + {% set tests_to_skip = tests_to_skip + " or test_max_geom_attribute[1000-human]" %} + {% set tests_to_skip = tests_to_skip + " or test_max_geom_attribute[10000-human]" %} # the following pygame tests are skipped [according to selector], because there is no rendering support during the CI build {% set tests_to_skip = tests_to_skip + " or test_human_rendering" %} # [osx] {% set tests_to_skip = tests_to_skip + " or test_keyboard_irrelevant_keydown_event" %} # [osx] From b12092e3cbe7569feba85983681b6acbb1b05e67 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 9 Oct 2024 23:49:44 +0200 Subject: [PATCH 11/23] Add fixes for failing tests --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1d6a3e5..2ba63b5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,10 +78,9 @@ outputs: - pip - jax >=0.4 # [osx or linux64] - flax >=0.5.0 # [osx or linux64] - - mesalib # [linux] + - mesalib # [linux or osx] commands: - # Uncomment when https://github.com/conda-forge/proglog-feedstock/pull/3 is merged - # - pip check + - pip check {% set tests_to_skip = "_not_a_real_test" %} # These test requires mujoco_py, see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124082918 {% set tests_to_skip = tests_to_skip + " or test_verify_info_x_position" %} @@ -115,9 +114,10 @@ outputs: # See https://github.com/conda-forge/gymnasium-feedstock/pull/32#issuecomment-2031810613 {% set tests_to_skip = tests_to_skip + " or test_render_modes" %} # [aarch64] # need to specify opengl driver on linux to enable offscreen rendering in MuJoCo - - export MUJOCO_GL="osmesa" # [linux] - # atary test are skipped as we do not have atari ROMs in the CI - - rm tests/wrappers/test_atari_preprocessing.py # [unix] + - export MUJOCO_GL="osmesa" # [linux or osx] + # Ensure that pygame tests pass on osx, + # see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124699477 + - export SDL_VIDEODRIVER="dummy" # [osx] - pytest -v tests/ -k "not ({{ tests_to_skip }})" - name: gymnasium-atari @@ -127,10 +127,10 @@ outputs: run: - python - {{ pin_subpackage('gymnasium', exact=True) }} - - shimmy-atari + - ale-py >= 0.9 test: commands: - - echo "tested in shimmy-atari" + - echo "tested in ale-py" - name: gymnasium-box2d requirements: From 01736d656d85fd15547ef219093cf3c1c235035f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 9 Oct 2024 23:52:59 +0200 Subject: [PATCH 12/23] Update meta.yaml --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2ba63b5..eb92ea0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,3 @@ -{% set tests_to_skip = "_not_a_real_test" %} {% set version = "1.0.0" %} package: @@ -127,7 +126,7 @@ outputs: run: - python - {{ pin_subpackage('gymnasium', exact=True) }} - - ale-py >= 0.9 + - ale-py >=0.9 test: commands: - echo "tested in ale-py" From c4cf908096a427feb73e381af3f8ede3be5464f7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 10 Oct 2024 09:08:17 +0200 Subject: [PATCH 13/23] Delete test_atari as no ROM are available --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eb92ea0..9f0bd32 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -112,6 +112,10 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_video_size_zoom" %} # [osx] # See https://github.com/conda-forge/gymnasium-feedstock/pull/32#issuecomment-2031810613 {% set tests_to_skip = tests_to_skip + " or test_render_modes" %} # [aarch64] + # atary test are skipped as we do not have atari ROMs in the CI + # See https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2404215826 + - rm tests/wrappers/test_atari_preprocessing.py # [unix] + - del tests\\wrappers\\test_atari_preprocessing.py # [win] # need to specify opengl driver on linux to enable offscreen rendering in MuJoCo - export MUJOCO_GL="osmesa" # [linux or osx] # Ensure that pygame tests pass on osx, From 9a2e331af711b203f92c549b226693e95cc38aae Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 19 Oct 2024 23:10:43 +0400 Subject: [PATCH 14/23] Add additional constraint on mujoco version See https://github.com/Farama-Foundation/Gymnasium/pull/1221 for more details. --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9f0bd32..f177bed 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -168,7 +168,8 @@ outputs: run: - python - {{ pin_subpackage('gymnasium', exact=True) }} - - mujoco-python + # See https://github.com/Farama-Foundation/Gymnasium/pull/1221 + - mujoco-python >=2.3.6 - imageio >=2.14.1 test: imports: From e5fda0eac0d8e858dda23e01e0e27eec0fd51ddc Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 20 Oct 2024 17:56:18 +0400 Subject: [PATCH 15/23] Fix mujoco constraint --- recipe/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f177bed..8694911 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,6 +78,9 @@ outputs: - jax >=0.4 # [osx or linux64] - flax >=0.5.0 # [osx or linux64] - mesalib # [linux or osx] + # Just for tests a newer version of mujoco is required + # See https://github.com/Farama-Foundation/Gymnasium/pull/1221#issuecomment-2424973616 + - mujoco-python >=2.3.6 commands: - pip check {% set tests_to_skip = "_not_a_real_test" %} @@ -168,8 +171,7 @@ outputs: run: - python - {{ pin_subpackage('gymnasium', exact=True) }} - # See https://github.com/Farama-Foundation/Gymnasium/pull/1221 - - mujoco-python >=2.3.6 + - mujoco-python >=2.1.5 - imageio >=2.14.1 test: imports: From 268377bc99678df13fde7b800623be2389b979ff Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 20 Oct 2024 21:16:57 +0200 Subject: [PATCH 16/23] Create 1222.patch --- recipe/patches/1222.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 recipe/patches/1222.patch diff --git a/recipe/patches/1222.patch b/recipe/patches/1222.patch new file mode 100644 index 0000000..d2319ad --- /dev/null +++ b/recipe/patches/1222.patch @@ -0,0 +1,31 @@ +From 90000eb6dd53009bbb4d6c44cbeb40a1e072e559 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Sun, 20 Oct 2024 17:22:45 +0200 +Subject: [PATCH 1/2] Use multiprocessing.get_all_start_methods() in + test_async_with_dynamically_registered_env + +--- + tests/envs/registration/test_make_vec.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/envs/registration/test_make_vec.py b/tests/envs/registration/test_make_vec.py +index 64573ca6d..ce14f7cb8 100644 +--- a/tests/envs/registration/test_make_vec.py ++++ b/tests/envs/registration/test_make_vec.py +@@ -1,5 +1,6 @@ + """Testing of the `gym.make_vec` function.""" + ++import multiprocessing + import re + + import pytest +@@ -236,7 +237,7 @@ def test_make_vec_with_spec(env_id: str, kwargs: dict): + recreated_envs.close() + + +-@pytest.mark.parametrize("ctx", [None, "spawn", "fork", "forkserver"]) ++@pytest.mark.parametrize("ctx", [None] + multiprocessing.get_all_start_methods()) + def test_async_with_dynamically_registered_env(ctx): + gym.register("TestEnv-v0", CartPoleEnv) + + From a0955d7b656899c69f07fdb5162603867afaca67 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 20 Oct 2024 21:18:00 +0200 Subject: [PATCH 17/23] Update meta.yaml --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8694911..c07242e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,6 +7,9 @@ package: source: url: https://github.com/Farama-Foundation/Gymnasium/archive/refs/tags/v{{ version }}.tar.gz sha256: d61a54c70d1960a0b64c63fe87edc30a0bac09551c27d8d94c36c54bf5fae5d9 + patches: + # backport https://github.com/Farama-Foundation/Gymnasium/pull/1222 + - patches/1222.patch build: number: 0 From 01eef7c62442d4bb1942d43e108eed6cfb4abba6 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 22 Oct 2024 11:32:37 +0200 Subject: [PATCH 18/23] Skip rendering-related tests on macOS and Windows --- recipe/meta.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c07242e..d9b265b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -80,7 +80,7 @@ outputs: - pip - jax >=0.4 # [osx or linux64] - flax >=0.5.0 # [osx or linux64] - - mesalib # [linux or osx] + - mesalib # [linux] # Just for tests a newer version of mujoco is required # See https://github.com/Farama-Foundation/Gymnasium/pull/1221#issuecomment-2424973616 - mujoco-python >=2.3.6 @@ -116,6 +116,12 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_pygame_quit_event" %} # [osx] {% set tests_to_skip = tests_to_skip + " or test_video_size_no_zoom" %} # [osx] {% set tests_to_skip = tests_to_skip + " or test_video_size_zoom" %} # [osx] + # The following tests fail as for mujoco the osmesa rendering backend is only supported on Linux + # See https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2428691450 + {% set tests_to_skip = tests_to_skip + " or test_offscreen_viewer_custom_dimensions" %} # [osx or win] + {% set tests_to_skip = tests_to_skip + " or test_max_geom_attribute" %} # [osx or win] + {% set tests_to_skip = tests_to_skip + " or test_camera_id" %} # [osx or win] + {% set tests_to_skip = tests_to_skip + " or test_num_envs_screen_size" %} # [osx or win] # See https://github.com/conda-forge/gymnasium-feedstock/pull/32#issuecomment-2031810613 {% set tests_to_skip = tests_to_skip + " or test_render_modes" %} # [aarch64] # atary test are skipped as we do not have atari ROMs in the CI @@ -123,7 +129,7 @@ outputs: - rm tests/wrappers/test_atari_preprocessing.py # [unix] - del tests\\wrappers\\test_atari_preprocessing.py # [win] # need to specify opengl driver on linux to enable offscreen rendering in MuJoCo - - export MUJOCO_GL="osmesa" # [linux or osx] + - export MUJOCO_GL="osmesa" # [linux] # Ensure that pygame tests pass on osx, # see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124699477 - export SDL_VIDEODRIVER="dummy" # [osx] From 921e8481a0a91bf043c7c42998cdb30b1f1ae21d Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 22 Oct 2024 12:49:54 +0200 Subject: [PATCH 19/23] Skip crashing test in aarch64 --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d9b265b..397e404 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -124,6 +124,9 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_num_envs_screen_size" %} # [osx or win] # See https://github.com/conda-forge/gymnasium-feedstock/pull/32#issuecomment-2031810613 {% set tests_to_skip = tests_to_skip + " or test_render_modes" %} # [aarch64] + # This test segfaults on aarch64, probably due to qemu, + # see https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2428944434 + {% set tests_to_skip = tests_to_skip + " or test_resize_observation_wrapper" %} # [aarch64] # atary test are skipped as we do not have atari ROMs in the CI # See https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2404215826 - rm tests/wrappers/test_atari_preprocessing.py # [unix] From 93feb06f6dbc46cd86a2ba83cf2abbc1ef086dc4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 22 Oct 2024 13:11:47 +0200 Subject: [PATCH 20/23] Skip all test_resize on aarch64 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 397e404..1929bcc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -126,7 +126,7 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_render_modes" %} # [aarch64] # This test segfaults on aarch64, probably due to qemu, # see https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2428944434 - {% set tests_to_skip = tests_to_skip + " or test_resize_observation_wrapper" %} # [aarch64] + {% set tests_to_skip = tests_to_skip + " or test_resize" %} # [aarch64] # atary test are skipped as we do not have atari ROMs in the CI # See https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2404215826 - rm tests/wrappers/test_atari_preprocessing.py # [unix] From 20a2ba2f20161d6b2d0300c39e9c8c91f8f96e4a Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 22 Oct 2024 14:39:09 +0200 Subject: [PATCH 21/23] Update meta.yaml --- recipe/meta.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1929bcc..10c1768 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -75,6 +75,8 @@ outputs: requires: - mock - pytest + # Workaround for https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2428944434 + - pytest-forked # [aarch64] - scipy - dill - pip @@ -86,6 +88,9 @@ outputs: - mujoco-python >=2.3.6 commands: - pip check + {% set pytest_options = "" %} + # Workaround for https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2428944434 + {% set pytest_options = pytest_options + " --forked" %} # [aarch64] {% set tests_to_skip = "_not_a_real_test" %} # These test requires mujoco_py, see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124082918 {% set tests_to_skip = tests_to_skip + " or test_verify_info_x_position" %} @@ -124,9 +129,6 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_num_envs_screen_size" %} # [osx or win] # See https://github.com/conda-forge/gymnasium-feedstock/pull/32#issuecomment-2031810613 {% set tests_to_skip = tests_to_skip + " or test_render_modes" %} # [aarch64] - # This test segfaults on aarch64, probably due to qemu, - # see https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2428944434 - {% set tests_to_skip = tests_to_skip + " or test_resize" %} # [aarch64] # atary test are skipped as we do not have atari ROMs in the CI # See https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2404215826 - rm tests/wrappers/test_atari_preprocessing.py # [unix] @@ -136,7 +138,7 @@ outputs: # Ensure that pygame tests pass on osx, # see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124699477 - export SDL_VIDEODRIVER="dummy" # [osx] - - pytest -v tests/ -k "not ({{ tests_to_skip }})" + - pytest {{ pytest_options }} -v tests/ -k "not ({{ tests_to_skip }})" - name: gymnasium-atari requirements: From 27b8f93a899ba0ad5dfb4ce34b361105ec277fe5 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 22 Oct 2024 19:23:17 +0200 Subject: [PATCH 22/23] Add workaround for gomp TLS issue on aarch64 --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 10c1768..1667a5d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -135,6 +135,9 @@ outputs: - del tests\\wrappers\\test_atari_preprocessing.py # [win] # need to specify opengl driver on linux to enable offscreen rendering in MuJoCo - export MUJOCO_GL="osmesa" # [linux] + # Workaround for https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2429842932 + # Remove once test run under a glibc 2.32 distro + - export LD_PRELOAD=libgomp.so.1 # [aarch64] # Ensure that pygame tests pass on osx, # see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124699477 - export SDL_VIDEODRIVER="dummy" # [osx] From 45b6f64e9510f808e41d0fc473b042fe23884ac7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 22 Oct 2024 23:16:50 +0200 Subject: [PATCH 23/23] Remove use of pytest-forked --- recipe/meta.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1667a5d..674dc28 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -75,8 +75,6 @@ outputs: requires: - mock - pytest - # Workaround for https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2428944434 - - pytest-forked # [aarch64] - scipy - dill - pip @@ -88,9 +86,6 @@ outputs: - mujoco-python >=2.3.6 commands: - pip check - {% set pytest_options = "" %} - # Workaround for https://github.com/conda-forge/gymnasium-feedstock/pull/41#issuecomment-2428944434 - {% set pytest_options = pytest_options + " --forked" %} # [aarch64] {% set tests_to_skip = "_not_a_real_test" %} # These test requires mujoco_py, see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124082918 {% set tests_to_skip = tests_to_skip + " or test_verify_info_x_position" %} @@ -141,7 +136,7 @@ outputs: # Ensure that pygame tests pass on osx, # see https://github.com/conda-forge/gymnasium-feedstock/pull/36#issuecomment-2124699477 - export SDL_VIDEODRIVER="dummy" # [osx] - - pytest {{ pytest_options }} -v tests/ -k "not ({{ tests_to_skip }})" + - pytest -v tests/ -k "not ({{ tests_to_skip }})" - name: gymnasium-atari requirements: