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 -